[S390] add __cpuinit to appldata cpu hotplug notifier.

[linux-2.6-omap-h63xx.git] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index c32e60e79dea43b51b317b6d34e1d027165e6f93..951c4e858274618ba3295dbce522954088ea9379 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -67,8 +67,8 @@
 /* Parisc type numbers. */
 #define PORT_MUX       48
 
-/* Atmel AT91RM9200 SoC */
-#define PORT_AT91RM9200 49
+/* Atmel AT91xxx SoC */
+#define PORT_AT91      49
 
 /* Macintosh Zilog type numbers */
 #define PORT_MAC_ZILOG 50      /* m68k : not yet implemented */
@@ -130,9 +130,11 @@
 /* SUN4V Hypervisor Console */
 #define PORT_SUNHV     72
 
+#define PORT_S3C2412   73
+
+
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <linux/compiler.h>
 #include <linux/interrupt.h>
 #include <linux/circ_buf.h>
@@ -254,6 +256,7 @@ 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))