Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[linux-3.10.git] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 966e2e8a1740606a2848af06c5db6ce0c3d12b84..058cba70818a57654dc1fc0534fce9ecf0877a9b 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
 
 /* 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 */
 
 /* Macintosh Zilog type numbers */
 #define PORT_MAC_ZILOG 50      /* m68k : not yet implemented */


@@ -130,9 +130,11 @@
 /* SUN4V Hypervisor Console */
 #define PORT_SUNHV     72
 
 /* SUN4V Hypervisor Console */
 #define PORT_SUNHV     72
 

+#define PORT_S3C2412   73
+
+

 #ifdef __KERNEL__
 
 #ifdef __KERNEL__
 

-#include <linux/config.h>

 #include <linux/compiler.h>
 #include <linux/interrupt.h>
 #include <linux/circ_buf.h>
 #include <linux/compiler.h>
 #include <linux/interrupt.h>
 #include <linux/circ_buf.h>


@@ -335,7 +337,6 @@ struct uart_driver {
        struct module           *owner;
        const char              *driver_name;
        const char              *dev_name;
        struct module           *owner;
        const char              *driver_name;
        const char              *dev_name;

-       const char              *devfs_name;

        int                      major;
        int                      minor;
        int                      nr;
        int                      major;
        int                      minor;
        int                      nr;