X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fserial_core.h;h=4041122dabfcf66cd2eca416a227569f474b5c84;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=bd14858121ea2065fdd399c58c48dd6e1f513812;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index bd1485812..4041122da 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -127,9 +127,6 @@
 /* Hilscher netx */
 #define PORT_NETX	71
 
-/* SUN4V Hypervisor Console */
-#define PORT_SUNHV	72
-
 #ifdef __KERNEL__
 
 #include <linux/config.h>
@@ -254,7 +251,6 @@ struct uart_port {
 #define UPF_CONS_FLOW		((__force upf_t) (1 << 23))
 #define UPF_SHARE_IRQ		((__force upf_t) (1 << 24))
 #define UPF_BOOT_AUTOCONF	((__force upf_t) (1 << 28))
-#define UPF_DEAD		((__force upf_t) (1 << 30))
 #define UPF_IOREMAP		((__force upf_t) (1 << 31))
 
 #define UPF_CHANGE_MASK		((__force upf_t) (0x17fff))
@@ -370,9 +366,6 @@ void uart_parse_options(char *options, int *baud, int *parity, int *bits,
 int uart_set_options(struct uart_port *port, struct console *co, int baud,
 		     int parity, int bits, int flow);
 struct tty_driver *uart_console_device(struct console *co, int *index);
-void uart_console_write(struct uart_port *port, const char *s,
-			unsigned int count,
-			void (*putchar)(struct uart_port *, int));
 
 /*
  * Port/driver registration/removal