227 files changed, 2618 insertions, 3140 deletions

diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt
index 15838d706ea2..44c97e6accb2 100644
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
@@ -233,12 +233,10 @@ accomplished via the group operations specified on the group's
 config_item_type.
 
         struct configfs_group_operations {
-                int (*make_item)(struct config_group *group,
-                                 const char *name,
-                                 struct config_item **new_item);
-                int (*make_group)(struct config_group *group,
-                                  const char *name,
-                                  struct config_group **new_group);
+                struct config_item *(*make_item)(struct config_group *group,
+                                                 const char *name);
+                struct config_group *(*make_group)(struct config_group *group,
+                                                   const char *name);
                 int (*commit_item)(struct config_item *item);
                 void (*disconnect_notify)(struct config_group *group,
                                           struct config_item *item);
diff --git a/Documentation/filesystems/configfs/configfs_example.c b/Documentation/filesystems/configfs/configfs_example.c
index 0b422acd470c..039648791701 100644
--- a/Documentation/filesystems/configfs/configfs_example.c
+++ b/Documentation/filesystems/configfs/configfs_example.c
@@ -273,13 +273,13 @@ static inline struct simple_children *to_simple_children(struct config_item *ite
         return item ? container_of(to_config_group(item), struct simple_children, group) : NULL;
 }
 
-static int simple_children_make_item(struct config_group *group, const char *name, struct config_item **new_item)
+static struct config_item *simple_children_make_item(struct config_group *group, const char *name)
 {
         struct simple_child *simple_child;
 
         simple_child = kzalloc(sizeof(struct simple_child), GFP_KERNEL);
         if (!simple_child)
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
 
 
         config_item_init_type_name(&simple_child->item, name,
@@ -287,8 +287,7 @@ static int simple_children_make_item(struct config_group *group, const char *nam
 
         simple_child->storeme = 0;
 
-        *new_item = &simple_child->item;
-        return 0;
+        return &simple_child->item;
 }
 
 static struct configfs_attribute simple_children_attr_description = {
@@ -360,21 +359,20 @@ static struct configfs_subsystem simple_children_subsys = {
  * children of its own.
  */
 
-static int group_children_make_group(struct config_group *group, const char *name, struct config_group **new_group)
+static struct config_group *group_children_make_group(struct config_group *group, const char *name)
 {
         struct simple_children *simple_children;
 
         simple_children = kzalloc(sizeof(struct simple_children),
                                   GFP_KERNEL);
         if (!simple_children)
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
 
 
         config_group_init_type_name(&simple_children->group, name,
                                     &simple_children_type);
 
-        *new_group = &simple_children->group;
-        return 0;
+        return &simple_children->group;
 }
 
 static struct configfs_attribute group_children_attr_description = {
diff --git a/Documentation/serial/driver b/Documentation/serial/driver
index 88ad615dd338..77ba0afbe4db 100644
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
@@ -186,6 +186,17 @@ hardware.
         Locking: port_sem taken.
         Interrupts: caller dependent.
 
+  flush_buffer(port)
+        Flush any write buffers, reset any DMA state and stop any
+        ongoing DMA transfers.
+
+        This will be called whenever the port->info->xmit circular
+        buffer is cleared.
+
+        Locking: port->lock taken.
+        Interrupts: locally disabled.
+        This call must not sleep
+
   set_termios(port,termios,oldtermios)
         Change the port parameters, including word length, parity, stop
         bits.  Update read_status_mask and ignore_status_mask to indicate
diff --git a/arch/cris/arch-v10/boot/Makefile b/arch/cris/arch-v10/boot/Makefile
index 20c83a53caf3..217203014433 100644
--- a/arch/cris/arch-v10/boot/Makefile
+++ b/arch/cris/arch-v10/boot/Makefile
@@ -2,7 +2,6 @@
 # arch/cris/arch-v10/boot/Makefile
 #
 
-OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss
 
 subdir- := compressed rescue
diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
index 4a031cb27eb9..08d943ce4be7 100644
--- a/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/arch/cris/arch-v10/boot/compressed/Makefile
@@ -2,12 +2,10 @@
 # arch/cris/arch-v10/boot/compressed/Makefile
 #
 
-CC = gcc-cris -melf $(LINUXINCLUDE)
-ccflags-y += -O2
-LD = ld-cris
-ldflags-y += -T $(obj)/decompress.ld
+asflags-y += $(LINUXINCLUDE)
+ccflags-y += -O2 $(LINUXINCLUDE)
+ldflags-y += -T $(srctree)/$(obj)/decompress.ld
 OBJECTS = $(obj)/head.o $(obj)/misc.o
-OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss
 
 quiet_cmd_image = BUILD   $@
@@ -21,12 +19,6 @@ $(obj)/decompress.o: $(OBJECTS) FORCE
 $(obj)/decompress.bin: $(obj)/decompress.o FORCE
         $(call if_changed,objcopy)
 
-$(obj)/head.o: $(obj)/head.S .config
-        @$(CC) -D__ASSEMBLY__ -traditional -c $< -o $@
-
-$(obj)/misc.o: $(obj)/misc.c .config
-        @$(CC) -D__KERNEL__ -c $< -o $@
-
 $(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
         $(call if_changed,image)
 
diff --git a/arch/cris/arch-v10/boot/compressed/decompress.ld b/arch/cris/arch-v10/boot/compressed/decompress.ld
index 0b0a14fe6177..e80f4594d543 100644
--- a/arch/cris/arch-v10/boot/compressed/decompress.ld
+++ b/arch/cris/arch-v10/boot/compressed/decompress.ld
@@ -1,4 +1,5 @@
-OUTPUT_FORMAT(elf32-us-cris)
+/* OUTPUT_FORMAT(elf32-us-cris) */
+OUTPUT_FORMAT(elf32-cris)
 
 MEMORY 
         {
diff --git a/arch/cris/arch-v10/boot/compressed/head.S b/arch/cris/arch-v10/boot/compressed/head.S
index 610bdb237553..981fbae84959 100644
--- a/arch/cris/arch-v10/boot/compressed/head.S
+++ b/arch/cris/arch-v10/boot/compressed/head.S
@@ -15,77 +15,77 @@
 #define COMMAND_LINE_MAGIC 0x87109563
 
         ;; Exported symbols
-        
-        .globl  _input_data
 
-        
+        .globl  input_data
+
+
         .text
 
         nop
         di
 
 ;; We need to initialze DRAM registers before we start using the DRAM
-        
-        cmp.d   RAM_INIT_MAGIC, r8      ; Already initialized?
+
+        cmp.d   RAM_INIT_MAGIC, $r8     ; Already initialized?
         beq     dram_init_finished
         nop
-        
+
 #include "../../lib/dram_init.S"
-        
-dram_init_finished:     
-                
+
+dram_init_finished:
+
         ;; Initiate the PA and PB ports
 
-        move.b   CONFIG_ETRAX_DEF_R_PORT_PA_DATA, r0
-        move.b   r0, [R_PORT_PA_DATA]
+        move.b   CONFIG_ETRAX_DEF_R_PORT_PA_DATA, $r0
+        move.b   $r0, [R_PORT_PA_DATA]
 
-        move.b   CONFIG_ETRAX_DEF_R_PORT_PA_DIR, r0
-        move.b   r0, [R_PORT_PA_DIR]
+        move.b   CONFIG_ETRAX_DEF_R_PORT_PA_DIR, $r0
+        move.b   $r0, [R_PORT_PA_DIR]
 
-        move.b   CONFIG_ETRAX_DEF_R_PORT_PB_DATA, r0
-        move.b   r0, [R_PORT_PB_DATA]
+        move.b   CONFIG_ETRAX_DEF_R_PORT_PB_DATA, $r0
+        move.b   $r0, [R_PORT_PB_DATA]
 
-        move.b   CONFIG_ETRAX_DEF_R_PORT_PB_DIR, r0
-        move.b   r0, [R_PORT_PB_DIR]
+        move.b   CONFIG_ETRAX_DEF_R_PORT_PB_DIR, $r0
+        move.b   $r0, [R_PORT_PB_DIR]
 
         ;; Setup the stack to a suitably high address.
         ;; We assume 8 MB is the minimum DRAM in an eLinux
         ;; product and put the sp at the top for now.
 
-        move.d  0x40800000, sp
+        move.d  0x40800000, $sp
 
         ;; Figure out where the compressed piggyback image is
         ;; in the flash (since we wont try to copy it to DRAM
         ;; before unpacking). It is at _edata, but in flash.
         ;; Use (_edata - basse) as offset to the current PC.
-        
-basse:  move.d  pc, r5
-        and.d   0x7fffffff, r5  ; strip any non-cache bit
-        subq    2, r5           ; compensate for the move.d pc instr
-        move.d  r5, r0          ; save for later - flash address of 'basse'
-        add.d   _edata, r5
-        sub.d   basse, r5       ; r5 = flash address of '_edata'
-        
+
+basse:  move.d  $pc, $r5
+        and.d   0x7fffffff, $r5 ; strip any non-cache bit
+        subq    2, $r5          ; compensate for the move.d $pc instr
+        move.d  $r5, $r0                ; save for later - flash address of 'basse'
+        add.d   _edata, $r5
+        sub.d   basse, $r5      ; $r5 = flash address of '_edata'
+
         ;; Copy text+data to DRAM
-        
-        move.d  basse, r1       ; destination
-        move.d  _edata, r2      ; end destination
-1:      move.w  [r0+], r3
-        move.w  r3, [r1+]
-        cmp.d   r2, r1
+
+        move.d  basse, $r1      ; destination
+        move.d  _edata, $r2     ; end destination
+1:      move.w  [$r0+], $r3
+        move.w  $r3, [$r1+]
+        cmp.d   $r2, $r1
         bcs     1b
         nop
 
-        move.d  r5, [_input_data] ; for the decompressor
+        move.d  $r5, [input_data] ; for the decompressor
 
 
         ;; Clear the decompressors BSS (between _edata and _end)
-        
-        moveq   0, r0
-        move.d  _edata, r1
-        move.d  _end, r2
-1:      move.w  r0, [r1+]
-        cmp.d   r2, r1
+
+        moveq   0, $r0
+        move.d  _edata, $r1
+        move.d  _end, $r2
+1:      move.w  $r0, [$r1+]
+        cmp.d   $r2, $r1
         bcs     1b
         nop
 
@@ -94,16 +94,16 @@ basse:	move.d	pc, r5
         move.d  $r10, [$r12]
         move.d  _cmd_line_addr, $r12
         move.d  $r11, [$r12]
-        
-        ;; Do the decompression and save compressed size in _inptr
 
-        jsr     _decompress_kernel
-        
-        ;; Put start address of root partition in r9 so the kernel can use it
+        ;; Do the decompression and save compressed size in inptr
+
+        jsr     decompress_kernel
+
+        ;; Put start address of root partition in $r9 so the kernel can use it
         ;; when mounting from flash
 
-        move.d  [_input_data], r9       ; flash address of compressed kernel
-        add.d   [_inptr], r9            ; size of compressed kernel
+        move.d  [input_data], $r9       ; flash address of compressed kernel
+        add.d   [inptr], $r9            ; size of compressed kernel
 
         ;; Restore command line magic and address.
         move.d  _cmd_line_magic, $r10
@@ -112,12 +112,12 @@ basse:	move.d	pc, r5
         move.d  [$r11], $r11
 
         ;; Enter the decompressed kernel
-        move.d  RAM_INIT_MAGIC, r8      ; Tell kernel that DRAM is initialized
+        move.d  RAM_INIT_MAGIC, $r8     ; Tell kernel that DRAM is initialized
         jump    0x40004000      ; kernel is linked to this address
-        
+
         .data
 
-_input_data:
+input_data:
         .dword  0               ; used by the decompressor
 _cmd_line_magic:
         .dword 0
diff --git a/arch/cris/arch-v10/boot/compressed/misc.c b/arch/cris/arch-v10/boot/compressed/misc.c
index 9a43ab19391e..18e13bce1400 100644
--- a/arch/cris/arch-v10/boot/compressed/misc.c
+++ b/arch/cris/arch-v10/boot/compressed/misc.c
@@ -29,12 +29,10 @@
 #define OF(args)  args
 #define STATIC static
 
-void* memset(void* s, int c, size_t n);
-void* memcpy(void* __dest, __const void* __src,
-             size_t __n);
-
-#define memzero(s, n)     memset ((s), 0, (n))
+void *memset(void *s, int c, size_t n);
+void *memcpy(void *__dest, __const void *__src, size_t __n);
 
+#define memzero(s, n)     memset((s), 0, (n))
 
 typedef unsigned char  uch;
 typedef unsigned short ush;
@@ -62,57 +60,69 @@ static unsigned outcnt = 0;  /* bytes in output buffer */
 #define ENCRYPTED    0x20 /* bit 5 set: file is encrypted */
 #define RESERVED     0xC0 /* bit 6,7:   reserved */
 
-#define get_byte() inbuf[inptr++]       
-        
+#define get_byte() (inbuf[inptr++])
+
 /* Diagnostic functions */
 #ifdef DEBUG
-#  define Assert(cond,msg) {if(!(cond)) error(msg);}
+#  define Assert(cond, msg) do { \
+                if (!(cond)) \
+                        error(msg); \
+        } while (0)
 #  define Trace(x) fprintf x
-#  define Tracev(x) {if (verbose) fprintf x ;}
-#  define Tracevv(x) {if (verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
+#  define Tracev(x) do { \
+                if (verbose) \
+                        fprintf x; \
+        } while (0)
+#  define Tracevv(x) do { \
+                if (verbose > 1) \
+                        fprintf x; \
+        } while (0)
+#  define Tracec(c, x) do { \
+                if (verbose && (c)) \
+                        fprintf x; \
+        } while (0)
+#  define Tracecv(c, x) do { \
+                if (verbose > 1 && (c)) \
+                        fprintf x; \
+        } while (0)
 #else
-#  define Assert(cond,msg)
+#  define Assert(cond, msg)
 #  define Trace(x)
 #  define Tracev(x)
 #  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
+#  define Tracec(c, x)
+#  define Tracecv(c, x)
 #endif
 
-static int  fill_inbuf(void);
 static void flush_window(void);
 static void error(char *m);
-static void gzip_mark(void **);
-static void gzip_release(void **);
 
 extern char *input_data;  /* lives in head.S */
 
 static long bytes_out = 0;
 static uch *output_data;
 static unsigned long output_ptr = 0;
- 
+
 static void *malloc(int size);
 static void free(void *where);
-static void error(char *m);
 static void gzip_mark(void **);
 static void gzip_release(void **);
- 
+
 static void puts(const char *);
 
 /* the "heap" is put directly after the BSS ends, at end */
-  
-extern int end;
-static long free_mem_ptr = (long)&end;
- 
+
+extern int _end;
+static long free_mem_ptr = (long)&_end;
+
 #include "../../../../../lib/inflate.c"
 
 static void *malloc(int size)
 {
         void *p;
 
-        if (size <0) error("Malloc error");
+        if (size < 0)
+                error("Malloc error");
 
         free_mem_ptr = (free_mem_ptr + 3) & ~3; /* Align */
 
@@ -142,44 +152,47 @@ static void
 puts(const char *s)
 {
 #ifndef CONFIG_ETRAX_DEBUG_PORT_NULL
-        while(*s) {
+        while (*s) {
 #ifdef CONFIG_ETRAX_DEBUG_PORT0
-                while(!(*R_SERIAL0_STATUS & (1 << 5))) ;
+                while (!(*R_SERIAL0_STATUS & (1 << 5))) ;
                 *R_SERIAL0_TR_DATA = *s++;
 #endif
 #ifdef CONFIG_ETRAX_DEBUG_PORT1
-                while(!(*R_SERIAL1_STATUS & (1 << 5))) ;
+                while (!(*R_SERIAL1_STATUS & (1 << 5))) ;
                 *R_SERIAL1_TR_DATA = *s++;
 #endif
 #ifdef CONFIG_ETRAX_DEBUG_PORT2
-                while(!(*R_SERIAL2_STATUS & (1 << 5))) ;
+                while (!(*R_SERIAL2_STATUS & (1 << 5))) ;
                 *R_SERIAL2_TR_DATA = *s++;
 #endif
 #ifdef CONFIG_ETRAX_DEBUG_PORT3
-                while(!(*R_SERIAL3_STATUS & (1 << 5))) ;
+                while (!(*R_SERIAL3_STATUS & (1 << 5))) ;
                 *R_SERIAL3_TR_DATA = *s++;
 #endif
         }
 #endif
 }
 
-void*
-memset(void* s, int c, size_t n)
+void *memset(void *s, int c, size_t n)
 {
         int i;
-        char *ss = (char*)s;
+        char *ss = (char *)s;
+
+        for (i = 0; i < n; i++)
+                ss[i] = c;
 
-        for (i=0;i<n;i++) ss[i] = c;
+        return s;
 }
 
-void*
-memcpy(void* __dest, __const void* __src,
-                            size_t __n)
+void *memcpy(void *__dest, __const void *__src, size_t __n)
 {
         int i;
         char *d = (char *)__dest, *s = (char *)__src;
 
-        for (i=0;i<__n;i++) d[i] = s[i];
+        for (i = 0; i < __n; i++)
+                d[i] = s[i];
+
+        return __dest;
 }
 
 /* ===========================================================================
@@ -187,46 +200,44 @@ memcpy(void* __dest, __const void* __src,
  * (Used for the decompressed data only.)
  */
 
-static void
-flush_window()
+static void flush_window(void)
 {
-    ulg c = crc;         /* temporary variable */
-    unsigned n;
-    uch *in, *out, ch;
-    
-    in = window;
-    out = &output_data[output_ptr]; 
-    for (n = 0; n < outcnt; n++) {
-            ch = *out++ = *in++;
-            c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
-    }
-    crc = c;
-    bytes_out += (ulg)outcnt;
-    output_ptr += (ulg)outcnt;
-    outcnt = 0;
+        ulg c = crc;         /* temporary variable */
+        unsigned n;
+        uch *in, *out, ch;
+
+        in = window;
+        out = &output_data[output_ptr];
+        for (n = 0; n < outcnt; n++) {
+                ch = *out = *in;
+                out++;
+                in++;
+                c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);
+        }
+        crc = c;
+        bytes_out += (ulg)outcnt;
+        output_ptr += (ulg)outcnt;
+        outcnt = 0;
 }
 
-static void
-error(char *x)
+static void error(char *x)
 {
         puts("\n\n");
         puts(x);
         puts("\n\n -- System halted\n");
 
-        while(1);       /* Halt */
+        while (1);      /* Halt */
 }
 
-void
-setup_normal_output_buffer()
+void setup_normal_output_buffer(void)
 {
         output_data = (char *)KERNEL_LOAD_ADR;
 }
 
-void
-decompress_kernel()
+void decompress_kernel(void)
 {
         char revision;
-        
+
         /* input_data is set in head.S */
         inbuf = input_data;
 
@@ -257,11 +268,10 @@ decompress_kernel()
 
         makecrc();
 
-        __asm__ volatile ("move vr,%0" : "=rm" (revision));
-        if (revision < 10)
-        {
+        __asm__ volatile ("move $vr,%0" : "=rm" (revision));
+        if (revision < 10) {
                 puts("You need an ETRAX 100LX to run linux 2.6\n");
-                while(1);
+                while (1);
         }
 
         puts("Uncompressing Linux...\n");
diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
index 2e5045b9e19c..07688da92708 100644
--- a/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -2,12 +2,9 @@
 # Makefile for rescue (bootstrap) code
 #
 
-CC = gcc-cris -mlinux $(LINUXINCLUDE)
-ccflags-y += -O2
-asflags-y += -traditional
-LD = gcc-cris -mlinux -nostdlib
-ldflags-y += -T $(obj)/rescue.ld
-OBJCOPY = objcopy-cris
+ccflags-y += -O2 $(LINUXINCLUDE)
+asflags-y += $(LINUXINCLUDE)
+ldflags-y += -T $(srctree)/$(obj)/rescue.ld
 OBJCOPYFLAGS = -O binary --remove-section=.bss
 obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
 OBJECT := $(obj)/head.o
diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c
index 52103d16dc6c..8769dc914073 100644
--- a/arch/cris/arch-v10/drivers/pcf8563.c
+++ b/arch/cris/arch-v10/drivers/pcf8563.c
@@ -233,7 +233,7 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
 
                 if (copy_to_user((struct rtc_time *) arg, &tm,
                                  sizeof tm)) {
-                        spin_unlock(&rtc_lock);
+                        mutex_unlock(&rtc_lock);
                         return -EFAULT;
                 }
 
diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c
index 04d5eee2c90c..3dc6e91ba39e 100644
--- a/arch/cris/arch-v10/kernel/debugport.c
+++ b/arch/cris/arch-v10/kernel/debugport.c
@@ -426,12 +426,18 @@ static int dummy_write(struct tty_struct * tty,
         return count;
 }
 
-static int
-dummy_write_room(struct tty_struct *tty)
+static int dummy_write_room(struct tty_struct *tty)
 {
         return 8192;
 }
 
+static const struct tty_operations dummy_ops = {
+        .open = dummy_open,
+        .close = dummy_close,
+        .write = dummy_write,
+        .write_room = dummy_write_room,
+};
+
 void __init
 init_dummy_console(void)
 {
@@ -444,14 +450,14 @@ init_dummy_console(void)
         dummy_driver.type = TTY_DRIVER_TYPE_SERIAL;
         dummy_driver.subtype = SERIAL_TYPE_NORMAL;
         dummy_driver.init_termios = tty_std_termios;
+        /* Normally B9600 default... */
         dummy_driver.init_termios.c_cflag =
-                B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */
+                B115200 | CS8 | CREAD | HUPCL | CLOCAL;
         dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+        dummy_driver.init_termios.c_ispeed = 115200;
+        dummy_driver.init_termios.c_ospeed = 115200;
 
-        dummy_driver.open = dummy_open;
-        dummy_driver.close = dummy_close;
-        dummy_driver.write = dummy_write;
-        dummy_driver.write_room = dummy_write_room;
+        dummy_driver.ops = &dummy_ops;
         if (tty_register_driver(&dummy_driver))
                 panic("Couldn't register dummy serial driver\n");
 }
diff --git a/arch/cris/arch-v32/boot/Makefile b/arch/cris/arch-v32/boot/Makefile
index 3f91349c5f12..99896ad60b30 100644
--- a/arch/cris/arch-v32/boot/Makefile
+++ b/arch/cris/arch-v32/boot/Makefile
@@ -2,7 +2,6 @@
 # arch/cris/arch-v32/boot/Makefile
 #
 
-OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary -R .note -R .comment
 
 subdir- := compressed rescue
diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile
index 2c8c2c3039c5..d6335f26083b 100644
--- a/arch/cris/arch-v32/boot/compressed/Makefile
+++ b/arch/cris/arch-v32/boot/compressed/Makefile
@@ -2,14 +2,10 @@
 # arch/cris/arch-v32/boot/compressed/Makefile
 #
 
-CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE)
 asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch
 ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch
-LD = gcc-cris -mlinux -march=v32 -nostdlib
-ldflags-y += -T $(obj)/decompress.ld
-obj-y = head.o misc.o
+ldflags-y += -T $(srctree)/$(obj)/decompress.ld
 OBJECTS = $(obj)/head.o $(obj)/misc.o
-OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss
 
 quiet_cmd_image = BUILD   $@
diff --git a/arch/cris/arch-v32/boot/rescue/Makefile b/arch/cris/arch-v32/boot/rescue/Makefile
index c0987795dcb7..44ae0ad61f90 100644
--- a/arch/cris/arch-v32/boot/rescue/Makefile
+++ b/arch/cris/arch-v32/boot/rescue/Makefile
@@ -7,9 +7,8 @@ ccflags-y += -O2 -I $(srctree)/include/asm/arch/mach/ \
                 -I $(srctree)/include/asm/arch
 asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch
 LD = gcc-cris -mlinux -march=v32 -nostdlib
-ldflags-y += -T $(obj)/rescue.ld
+ldflags-y += -T $(srctree)/$(obj)/rescue.ld
 LDPOSTFLAGS = -lgcc
-OBJCOPY = objcopy-cris
 OBJCOPYFLAGS = -O binary --remove-section=.bss
 obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
 OBJECT := $(obj)/head.o
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c
index 53db3870ba04..f263ab571221 100644
--- a/arch/cris/arch-v32/drivers/pcf8563.c
+++ b/arch/cris/arch-v32/drivers/pcf8563.c
@@ -229,7 +229,7 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
 
                 if (copy_to_user((struct rtc_time *) arg, &tm,
                                  sizeof tm)) {
-                        spin_unlock(&rtc_lock);
+                        mutex_unlock(&rtc_lock);
                         return -EFAULT;
                 }
 
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 23cafc80d2a4..24b1ad5334cb 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -193,18 +193,6 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
  * -------------------------------------------------------------------
  */
 
-#if 0
-/*
- * not really used in our situation so keep them commented out for now
- */
-static DECLARE_TASK_QUEUE(tq_serial); /* used to be at the top of the file */
-static void do_serial_bh(void)
-{
-        run_task_queue(&tq_serial);
-        printk(KERN_ERR "do_serial_bh: called\n");
-}
-#endif
-
 static void do_softint(struct work_struct *private_)
 {
         printk(KERN_ERR "simserial: do_softint called\n");
@@ -351,11 +339,7 @@ static void rs_flush_buffer(struct tty_struct *tty)
         info->xmit.head = info->xmit.tail = 0;
         local_irq_restore(flags);
 
-        wake_up_interruptible(&tty->write_wait);
-
-        if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-            tty->ldisc.write_wakeup)
-                (tty->ldisc.write_wakeup)(tty);
+        tty_wakeup(tty);
 }
 
 /*
@@ -404,12 +388,6 @@ static void rs_unthrottle(struct tty_struct * tty)
         printk(KERN_INFO "simrs_unthrottle called\n");
 }
 
-/*
- * rs_break() --- routine which turns the break handling on or off
- */
-static void rs_break(struct tty_struct *tty, int break_state)
-{
-}
 
 static int rs_ioctl(struct tty_struct *tty, struct file * file,
                     unsigned int cmd, unsigned long arg)
@@ -422,14 +400,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
         }
 
         switch (cmd) {
-                case TIOCMGET:
-                        printk(KERN_INFO "rs_ioctl: TIOCMGET called\n");
-                        return -EINVAL;
-                case TIOCMBIS:
-                case TIOCMBIC:
-                case TIOCMSET:
-                        printk(KERN_INFO "rs_ioctl: TIOCMBIS/BIC/SET called\n");
-                        return -EINVAL;
                 case TIOCGSERIAL:
                         printk(KERN_INFO "simrs_ioctl TIOCGSERIAL called\n");
                         return 0;
@@ -488,14 +458,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
 
 static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
-        unsigned int cflag = tty->termios->c_cflag;
-
-        if (   (cflag == old_termios->c_cflag)
-            && (   RELEVANT_IFLAG(tty->termios->c_iflag)
-                == RELEVANT_IFLAG(old_termios->c_iflag)))
-          return;
-
-
         /* Handle turning off CRTSCTS */
         if ((old_termios->c_cflag & CRTSCTS) &&
             !(tty->termios->c_cflag & CRTSCTS)) {
@@ -623,9 +585,8 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
          * the line discipline to only process XON/XOFF characters.
          */
         shutdown(info);
-        if (tty->ops->flush_buffer)
-                tty->ops->flush_buffer(tty);
-        if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty);
+        rs_flush_buffer(tty);
+        tty_ldisc_flush(tty);
         info->event = 0;
         info->tty = NULL;
         if (info->blocked_open) {
@@ -955,7 +916,6 @@ static const struct tty_operations hp_ops = {
         .stop = rs_stop,
         .start = rs_start,
         .hangup = rs_hangup,
-        .break_ctl = rs_break,
         .wait_until_sent = rs_wait_until_sent,
         .read_proc = rs_read_proc,
 };
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 55ea52fe6aca..8c5e1de68fcb 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -490,28 +490,6 @@ config ATARI_MFPSER
           Note for Falcon users: You also have an MFP port, it's just not
           wired to the outside... But you could use the port under Linux.
 
-config ATARI_SCC
-        tristate "Atari SCC serial support"
-        depends on ATARI
-        ---help---
-          If you have serial ports based on a Zilog SCC chip (Modem2, Serial2,
-          LAN) and like to use them under Linux, say Y. All built-in SCC's are
-          supported (TT, MegaSTE, Falcon), and also the ST-ESCC. If you have
-          two connectors for channel A (Serial2 and LAN), they are visible as
-          two separate devices.
-
-          To compile this driver as a module, choose M here.
-
-config ATARI_SCC_DMA
-        bool "Atari SCC serial DMA support"
-        depends on ATARI_SCC
-        help
-          This enables DMA support for receiving data on channel A of the SCC.
-          If you have a TT you may say Y here and read
-          drivers/char/atari_SCC.README. All other users should say N here,
-          because only the TT has SCC-DMA, even if your machine keeps claiming
-          so at boot time.
-
 config ATARI_MIDI
         tristate "Atari MIDI serial support"
         depends on ATARI
@@ -578,18 +556,6 @@ config MAC_HID
         depends on INPUT_ADBHID
         default y
 
-config ADB_KEYBOARD
-        bool "Support for ADB keyboard (old driver)"
-        depends on MAC && !INPUT_ADBHID
-        help
-          This option allows you to use an ADB keyboard attached to your
-          machine. Note that this disables any other (ie. PS/2) keyboard
-          support, even if your machine is physically capable of using both at
-          the same time.
-
-          If you use an ADB keyboard (4 pin connector), say Y here.
-          If you use a PS/2 keyboard (6 pin connector), say N here.
-
 config HPDCA
         tristate "HP DCA serial support"
         depends on DIO && SERIAL_8250
@@ -640,7 +606,7 @@ config DN_SERIAL
 
 config SERIAL_CONSOLE
         bool "Support for serial port console"
-        depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_SCC=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
+        depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
         ---help---
           If you say Y here, it will be possible to use a serial port as the
           system console (the system console is the device which receives all
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index b15173f28a23..8133dbc44964 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -13,7 +13,7 @@
 # Copyright (C) 1994 by Hamish Macdonald
 #
 
-KBUILD_DEFCONFIG := amiga_defconfig
+KBUILD_DEFCONFIG := multi_defconfig
 
 # override top level makefile
 AS += -m68020
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 50f5daab46b7..df679d96b1cb 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -36,14 +36,11 @@
 #include <asm/machdep.h>
 #include <asm/io.h>
 
-unsigned long amiga_model;
-EXPORT_SYMBOL(amiga_model);
+static unsigned long amiga_model;
 
 unsigned long amiga_eclock;
 EXPORT_SYMBOL(amiga_eclock);
 
-unsigned long amiga_masterclock;
-
 unsigned long amiga_colorclock;
 EXPORT_SYMBOL(amiga_colorclock);
 
@@ -51,7 +48,9 @@ unsigned long amiga_chipset;
 EXPORT_SYMBOL(amiga_chipset);
 
 unsigned char amiga_vblank;
-unsigned char amiga_psfreq;
+EXPORT_SYMBOL(amiga_vblank);
+
+static unsigned char amiga_psfreq;
 
 struct amiga_hw_present amiga_hw_present;
 EXPORT_SYMBOL(amiga_hw_present);
@@ -92,8 +91,6 @@ static char *amiga_models[] __initdata = {
 static char amiga_model_name[13] = "Amiga ";
 
 static void amiga_sched_init(irq_handler_t handler);
-/* amiga specific irq functions */
-extern void amiga_init_IRQ(void);
 static void amiga_get_model(char *model);
 static int amiga_get_hardware_list(char *buffer);
 /* amiga specific timer functions */
@@ -107,8 +104,6 @@ static void amiga_reset(void);
 extern void amiga_init_sound(void);
 static void amiga_mem_console_write(struct console *co, const char *b,
                                     unsigned int count);
-void amiga_serial_console_write(struct console *co, const char *s,
-                                unsigned int count);
 #ifdef CONFIG_HEARTBEAT
 static void amiga_heartbeat(int on);
 #endif
@@ -418,8 +413,7 @@ void __init config_amiga(void)
         mach_heartbeat = amiga_heartbeat;
 #endif
 
-        /* Fill in the clock values (based on the 700 kHz E-Clock) */
-        amiga_masterclock = 40*amiga_eclock;    /* 28 MHz */
+        /* Fill in the clock value (based on the 700 kHz E-Clock) */
         amiga_colorclock = 5*amiga_eclock;      /* 3.5 MHz */
 
         /* clear all DMA bits */
@@ -817,8 +811,8 @@ static void amiga_serial_putc(char c)
                 ;
 }
 
-void amiga_serial_console_write(struct console *co, const char *s,
-                                unsigned int count)
+static void amiga_serial_console_write(struct console *co, const char *s,
+                                       unsigned int count)
 {
         while (count--) {
                 if (*s == '\n')
@@ -827,7 +821,7 @@ void amiga_serial_console_write(struct console *co, const char *s,
         }
 }
 
-#ifdef CONFIG_SERIAL_CONSOLE
+#if 0
 void amiga_serial_puts(const char *s)
 {
         amiga_serial_console_write(NULL, s, strlen(s));
diff --git a/arch/m68k/atari/debug.c b/arch/m68k/atari/debug.c
index 043ddbc61c7b..702b15ccfab7 100644
--- a/arch/m68k/atari/debug.c
+++ b/arch/m68k/atari/debug.c
@@ -20,14 +20,6 @@
 #include <asm/atarihw.h>
 #include <asm/atariints.h>
 
-/* Flag that Modem1 port is already initialized and used */
-int atari_MFP_init_done;
-EXPORT_SYMBOL(atari_MFP_init_done);
-
-/* Flag that Modem1 port is already initialized and used */
-int atari_SCC_init_done;
-EXPORT_SYMBOL(atari_SCC_init_done);
-
 /* Can be set somewhere, if a SCC master reset has already be done and should
  * not be repeated; used by kgdb */
 int atari_SCC_reset_done;
@@ -47,8 +39,8 @@ static inline void ata_mfp_out(char c)
         mfp.usart_dta = c;
 }
 
-void atari_mfp_console_write(struct console *co, const char *str,
-                             unsigned int count)
+static void atari_mfp_console_write(struct console *co, const char *str,
+                                    unsigned int count)
 {
         while (count--) {
                 if (*str == '\n')
@@ -66,8 +58,8 @@ static inline void ata_scc_out(char c)
         scc.cha_b_data = c;
 }
 
-void atari_scc_console_write(struct console *co, const char *str,
-                             unsigned int count)
+static void atari_scc_console_write(struct console *co, const char *str,
+                                    unsigned int count)
 {
         while (count--) {
                 if (*str == '\n')
@@ -83,8 +75,8 @@ static inline void ata_midi_out(char c)
         acia.mid_data = c;
 }
 
-void atari_midi_console_write(struct console *co, const char *str,
-                              unsigned int count)
+static void atari_midi_console_write(struct console *co, const char *str,
+                                     unsigned int count)
 {
         while (count--) {
                 if (*str == '\n')
@@ -136,7 +128,7 @@ static void atari_par_console_write(struct console *co, const char *str,
         }
 }
 
-#ifdef CONFIG_SERIAL_CONSOLE
+#if 0
 int atari_mfp_console_wait_key(struct console *co)
 {
         while (!(mfp.rcv_stat & 0x80))  /* wait for rx buf filled */
@@ -166,11 +158,7 @@ int atari_midi_console_wait_key(struct console *co)
  * SCC serial ports. They're used by the debugging interface, kgdb, and the
  * serial console code.
  */
-#ifndef CONFIG_SERIAL_CONSOLE
 static void __init atari_init_mfp_port(int cflag)
-#else
-void atari_init_mfp_port(int cflag)
-#endif
 {
         /*
          * timer values for 1200...115200 bps; > 38400 select 110, 134, or 150
@@ -193,8 +181,6 @@ void atari_init_mfp_port(int cflag)
         mfp.tim_dt_d = baud_table[baud];
         mfp.tim_ct_cd |= 0x01;          /* start timer D, 1:4 */
         mfp.trn_stat |= 0x01;           /* enable TX */
-
-        atari_MFP_init_done = 1;
 }
 
 #define SCC_WRITE(reg, val)                             \
@@ -214,11 +200,7 @@ void atari_init_mfp_port(int cflag)
                         MFPDELAY();                     \
         } while (0)
 
-#ifndef CONFIG_SERIAL_CONSOLE
 static void __init atari_init_scc_port(int cflag)
-#else
-void atari_init_scc_port(int cflag)
-#endif
 {
         extern int atari_SCC_reset_done;
         static int clksrc_table[9] =
@@ -277,14 +259,9 @@ void atari_init_scc_port(int cflag)
         SCC_WRITE(5, reg5 | 8);
 
         atari_SCC_reset_done = 1;
-        atari_SCC_init_done = 1;
 }
 
-#ifndef CONFIG_SERIAL_CONSOLE
 static void __init atari_init_midi_port(int cflag)
-#else
-void atari_init_midi_port(int cflag)
-#endif
 {
         int baud = cflag & CBAUD;
         int csize = ((cflag & CSIZE) == CS8) ? 0x10 : 0x00;
diff --git a/arch/m68k/fpsp040/Makefile b/arch/m68k/fpsp040/Makefile
index 0214d2f6f8b0..9506d883ace5 100644
--- a/arch/m68k/fpsp040/Makefile
+++ b/arch/m68k/fpsp040/Makefile
@@ -10,7 +10,6 @@ obj-y    := bindec.o binstr.o decbin.o do_func.o gen_except.o get_op.o \
             x_bsun.o x_fline.o x_operr.o x_ovfl.o x_snan.o x_store.o \
             x_unfl.o x_unimp.o x_unsupp.o bugfix.o skeleton.o
 
-EXTRA_AFLAGS := -traditional
 EXTRA_LDFLAGS := -x
 
 $(OS_OBJS): fpsp.h
diff --git a/arch/m68k/ifpsp060/Makefile b/arch/m68k/ifpsp060/Makefile
index 2fe8472cb5e3..43b435049452 100644
--- a/arch/m68k/ifpsp060/Makefile
+++ b/arch/m68k/ifpsp060/Makefile
@@ -6,5 +6,4 @@
 
 obj-y := fskeleton.o iskeleton.o os.o
 
-EXTRA_AFLAGS := -traditional
 EXTRA_LDFLAGS := -x
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile
index 7a62a718143b..3a7f62225504 100644
--- a/arch/m68k/kernel/Makefile
+++ b/arch/m68k/kernel/Makefile
@@ -16,5 +16,3 @@ devres-y = ../../../kernel/irq/devres.o
 
 obj-$(CONFIG_PCI)       += bios32.o
 obj-y$(CONFIG_MMU_SUN3) += dma.o        # no, it's not a typo
-
-EXTRA_AFLAGS := -traditional
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index a9fb83a8c180..ea1e44da19b9 100644
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -26,6 +26,7 @@
 
 #include <asm/bootinfo.h>
 #include <asm/setup.h>
+#include <asm/fpu.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
@@ -40,6 +41,11 @@
 #include <asm/dvma.h>
 #endif
 
+#if !FPSTATESIZE || !NR_IRQS
+#warning No CPU/platform type selected, your kernel will not work!
+#warning Are you building an allnoconfig kernel?
+#endif
+
 unsigned long m68k_machtype;
 EXPORT_SYMBOL(m68k_machtype);
 unsigned long m68k_cputype;
@@ -116,6 +122,7 @@ extern int bvme6000_parse_bootinfo(const struct bi_record *);
 extern int mvme16x_parse_bootinfo(const struct bi_record *);
 extern int mvme147_parse_bootinfo(const struct bi_record *);
 extern int hp300_parse_bootinfo(const struct bi_record *);
+extern int apollo_parse_bootinfo(const struct bi_record *);
 
 extern void config_amiga(void);
 extern void config_atari(void);
@@ -183,6 +190,8 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
                                 unknown = mvme147_parse_bootinfo(record);
                         else if (MACH_IS_HP300)
                                 unknown = hp300_parse_bootinfo(record);
+                        else if (MACH_IS_APOLLO)
+                                unknown = apollo_parse_bootinfo(record);
                         else
                                 unknown = 1;
                 }
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index 7537cc5e6159..99b0784c0552 100644
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@@ -1,6 +1,7 @@
 /* ld script to make m68k Linux kernel */
 
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 
 OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
 OUTPUT_ARCH(m68k)
@@ -41,7 +42,7 @@ SECTIONS
   _edata = .;                   /* End of data section */
 
   /* will be freed after init */
-  . = ALIGN(4096);              /* Init code and data */
+  . = ALIGN(PAGE_SIZE);         /* Init code and data */
   __init_begin = .;
   .init.text : {
         _sinittext = .;
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index cdc313e7c299..8a4919e4d36a 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -1,6 +1,7 @@
 /* ld script to make m68k Linux kernel */
 
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 
 OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")
 OUTPUT_ARCH(m68k)
@@ -34,7 +35,7 @@ SECTIONS
   _edata = .;
 
   /* will be freed after init */
-  . = ALIGN(8192);      /* Init code and data */
+  . = ALIGN(PAGE_SIZE); /* Init code and data */
 __init_begin = .;
         .init.text : {
                 _sinittext = .;
@@ -61,12 +62,12 @@ __init_begin = .;
         }
         SECURITY_INIT
 #ifdef CONFIG_BLK_DEV_INITRD
-        . = ALIGN(8192);
+        . = ALIGN(PAGE_SIZE);
         __initramfs_start = .;
         .init.ramfs : { *(.init.ramfs) }
         __initramfs_end = .;
 #endif
-        . = ALIGN(8192);
+        . = ALIGN(PAGE_SIZE);
         __init_end = .;
         .data.init.task : { *(.data.init_task) }
 
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index a18af095cd7c..af9abf8d9d98 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -2,7 +2,5 @@
 # Makefile for m68k-specific library files..
 #
 
-EXTRA_AFLAGS := -traditional
-
 lib-y   := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
            checksum.o string.o uaccess.o
diff --git a/arch/m68k/mac/Makefile b/arch/m68k/mac/Makefile
index 1d265ba365ad..daebd80bdef0 100644
--- a/arch/m68k/mac/Makefile
+++ b/arch/m68k/mac/Makefile
@@ -2,5 +2,5 @@
 # Makefile for Linux arch/m68k/mac source directory
 #
 
-obj-y           := config.o bootparse.o macints.o iop.o via.o oss.o psc.o \
+obj-y           := config.o macints.o iop.o via.o oss.o psc.o \
                         baboon.o macboing.o debug.o misc.o
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c
index 673a1085984d..dae9c982aa89 100644
--- a/arch/m68k/mac/baboon.c
+++ b/arch/m68k/mac/baboon.c
@@ -23,9 +23,7 @@
 /* #define DEBUG_IRQS */
 
 int baboon_present;
-volatile struct baboon *baboon;
-
-irqreturn_t baboon_irq(int, void *);
+static volatile struct baboon *baboon;
 
 #if 0
 extern int macide_ack_intr(struct ata_channel *);
@@ -50,20 +48,10 @@ void __init baboon_init(void)
 }
 
 /*
- * Register the Baboon interrupt dispatcher on nubus slot $C.
- */
-
-void __init baboon_register_interrupts(void)
-{
-        request_irq(IRQ_NUBUS_C, baboon_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
-                    "baboon", (void *) baboon);
-}
-
-/*
  * Baboon interrupt handler. This works a lot like a VIA.
  */
 
-irqreturn_t baboon_irq(int irq, void *dev_id)
+static irqreturn_t baboon_irq(int irq, void *dev_id)
 {
         int irq_bit, irq_num;
         unsigned char events;
@@ -95,6 +83,16 @@ irqreturn_t baboon_irq(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
+/*
+ * Register the Baboon interrupt dispatcher on nubus slot $C.
+ */
+
+void __init baboon_register_interrupts(void)
+{
+        request_irq(IRQ_NUBUS_C, baboon_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
+                    "baboon", (void *) baboon);
+}
+
 void baboon_irq_enable(int irq) {
 #ifdef DEBUG_IRQUSE
         printk("baboon_irq_enable(%d)\n", irq);
diff --git a/arch/m68k/mac/bootparse.c b/arch/m68k/mac/bootparse.c
deleted file mode 100644
index 36d223609823..000000000000
--- a/arch/m68k/mac/bootparse.c
+++ /dev/null
@@ -1,122 +0,0 @@
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <asm/irq.h>
-#include <asm/setup.h>
-#include <asm/bootinfo.h>
-#include <asm/macintosh.h>
-
-/*
- *      Booter vars
- */
-
-int boothowto;
-int _boothowto;
-
-/*
- *      Called early to parse the environment (passed to us from the booter)
- *      into a bootinfo struct. Will die as soon as we have our own booter
- */
-
-#define atol(x) simple_strtoul(x,NULL,0)
-
-void parse_booter(char *env)
-{
-        char *name;
-        char *value;
-#if 0
-        while(0 && *env)
-#else
-        while(*env)
-#endif
-        {
-                name=env;
-                value=name;
-                while(*value!='='&&*value)
-                        value++;
-                if(*value=='=')
-                        *value++=0;
-                env=value;
-                while(*env)
-                        env++;
-                env++;
-#if 0
-                if(strcmp(name,"VIDEO_ADDR")==0)
-                        mac_mch.videoaddr=atol(value);
-                if(strcmp(name,"ROW_BYTES")==0)
-                        mac_mch.videorow=atol(value);
-                if(strcmp(name,"SCREEN_DEPTH")==0)
-                        mac_mch.videodepth=atol(value);
-                if(strcmp(name,"DIMENSIONS")==0)
-                        mac_mch.dimensions=atol(value);
-#endif
-                if(strcmp(name,"BOOTTIME")==0)
-                        mac_bi_data.boottime=atol(value);
-                if(strcmp(name,"GMTBIAS")==0)
-                        mac_bi_data.gmtbias=atol(value);
-                if(strcmp(name,"BOOTERVER")==0)
-                        mac_bi_data.bootver=atol(value);
-                if(strcmp(name,"MACOS_VIDEO")==0)
-                        mac_bi_data.videological=atol(value);
-                if(strcmp(name,"MACOS_SCC")==0)
-                        mac_bi_data.sccbase=atol(value);
-                if(strcmp(name,"MACHINEID")==0)
-                        mac_bi_data.id=atol(value);
-                if(strcmp(name,"MEMSIZE")==0)
-                        mac_bi_data.memsize=atol(value);
-                if(strcmp(name,"SERIAL_MODEM_FLAGS")==0)
-                        mac_bi_data.serialmf=atol(value);
-                if(strcmp(name,"SERIAL_MODEM_HSKICLK")==0)
-                        mac_bi_data.serialhsk=atol(value);
-                if(strcmp(name,"SERIAL_MODEM_GPICLK")==0)
-                        mac_bi_data.serialgpi=atol(value);
-                if(strcmp(name,"SERIAL_PRINT_FLAGS")==0)
-                        mac_bi_data.printmf=atol(value);
-                if(strcmp(name,"SERIAL_PRINT_HSKICLK")==0)
-                        mac_bi_data.printhsk=atol(value);
-                if(strcmp(name,"SERIAL_PRINT_GPICLK")==0)
-                        mac_bi_data.printgpi=atol(value);
-                if(strcmp(name,"PROCESSOR")==0)
-                        mac_bi_data.cpuid=atol(value);
-                if(strcmp(name,"ROMBASE")==0)
-                        mac_bi_data.rombase=atol(value);
-                if(strcmp(name,"TIMEDBRA")==0)
-                        mac_bi_data.timedbra=atol(value);
-                if(strcmp(name,"ADBDELAY")==0)
-                        mac_bi_data.adbdelay=atol(value);
-        }
-#if 0   /* XXX: TODO with m68k_mach_* */
-        /* Fill in the base stuff */
-        boot_info.machtype=MACH_MAC;
-        /* Read this from the macinfo we got ! */
-/*      boot_info.cputype=CPU_68020|FPUB_68881;*/
-/*      boot_info.memory[0].addr=0;*/
-/*      boot_info.memory[0].size=((mac_bi_data.id>>7)&31)<<20;*/
-        boot_info.num_memory=1;         /* On a MacII */
-        boot_info.ramdisk_size=0;       /* For now */
-        *boot_info.command_line=0;
-#endif
- }
-
-
-void print_booter(char *env)
-{
-        char *name;
-        char *value;
-        while(*env)
-        {
-                name=env;
-                value=name;
-                while(*value!='='&&*value)
-                        value++;
-                if(*value=='=')
-                        *value++=0;
-                env=value;
-                while(*env)
-                        env++;
-                env++;
-                printk("%s=%s\n", name,value);
-        }
- }
-
-
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index ad3e3bacae39..c45e18449f32 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -46,7 +46,6 @@
 /* Mac bootinfo struct */
 
 struct mac_booter_data mac_bi_data;
-int mac_bisize = sizeof mac_bi_data;
 
 /* New m68k bootinfo stuff and videobase */
 
@@ -55,10 +54,8 @@ extern struct mem_info m68k_memory[NUM_MEMINFO];
 
 extern struct mem_info m68k_ramdisk;
 
-void *mac_env;                                  /* Loaded by the boot asm */
-
 /* The phys. video addr. - might be bogus on some machines */
-unsigned long mac_orig_videoaddr;
+static unsigned long mac_orig_videoaddr;
 
 /* Mac specific timer functions */
 extern unsigned long mac_gettimeoffset(void);
@@ -79,6 +76,8 @@ extern void mac_mksound(unsigned int, unsigned int);
 extern void nubus_sweep_video(void);
 
 static void mac_get_model(char *str);
+static void mac_identify(void);
+static void mac_report_hardware(void);
 
 static void __init mac_sched_init(irq_handler_t vector)
 {
@@ -765,7 +764,7 @@ static struct mac_model mac_data_table[] = {
         }
 };
 
-void __init mac_identify(void)
+static void __init mac_identify(void)
 {
         struct mac_model *m;
 
@@ -821,7 +820,7 @@ void __init mac_identify(void)
         baboon_init();
 }
 
-void __init mac_report_hardware(void)
+static void __init mac_report_hardware(void)
 {
         printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name);
 }
diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c
index e8a57138b4a6..2165740786a5 100644
--- a/arch/m68k/mac/debug.c
+++ b/arch/m68k/mac/debug.c
@@ -51,6 +51,8 @@ extern void mac_serial_print(const char *);
 static int peng, line;
 #endif
 
+#if 0
+
 void mac_debugging_short(int pos, short num)
 {
 #ifdef DEBUG_SCREEN
@@ -125,6 +127,8 @@ void mac_debugging_long(int pos, long addr)
 #endif
 }
 
+#endif  /*  0  */
+
 #ifdef DEBUG_SERIAL
 /*
  * TODO: serial debug code
@@ -142,12 +146,6 @@ struct mac_SCC {
 
 # define scc (*((volatile struct mac_SCC*)mac_bi_data.sccbase))
 
-/* Flag that serial port is already initialized and used */
-int mac_SCC_init_done;
-/* Can be set somewhere, if a SCC master reset has already be done and should
- * not be repeated; used by kgdb */
-int mac_SCC_reset_done;
-
 static int scc_port = -1;
 
 static struct console mac_console_driver = {
@@ -171,8 +169,8 @@ static struct console mac_console_driver = {
  * this driver if Mac.
  */
 
-void mac_debug_console_write(struct console *co, const char *str,
-                             unsigned int count)
+static void mac_debug_console_write(struct console *co, const char *str,
+                                    unsigned int count)
 {
         mac_serial_print(str);
 }
@@ -209,8 +207,8 @@ static inline void mac_scca_out(char c)
         scc.cha_a_data = c;
 }
 
-void mac_sccb_console_write(struct console *co, const char *str,
-                            unsigned int count)
+static void mac_sccb_console_write(struct console *co, const char *str,
+                                   unsigned int count)
 {
         while (count--) {
                 if (*str == '\n')
@@ -219,8 +217,8 @@ void mac_sccb_console_write(struct console *co, const char *str,
         }
 }
 
-void mac_scca_console_write(struct console *co, const char *str,
-                            unsigned int count)
+static void mac_scca_console_write(struct console *co, const char *str,
+                                   unsigned int count)
 {
         while (count--) {
                 if (*str == '\n')
@@ -265,14 +263,8 @@ void mac_scca_console_write(struct console *co, const char *str,
                     barrier();                          \
         } while(0)
 
-#ifndef CONFIG_SERIAL_CONSOLE
 static void __init mac_init_scc_port(int cflag, int port)
-#else
-void mac_init_scc_port(int cflag, int port)
-#endif
 {
-        extern int mac_SCC_reset_done;
-
         /*
          * baud rates: 1200, 1800, 2400, 4800, 9600, 19.2k, 38.4k, 57.6k, 115.2k
          */
@@ -340,22 +332,9 @@ void mac_init_scc_port(int cflag, int port)
                 SCCA_WRITE(3, reg3 | 1);
                 SCCA_WRITE(5, reg5 | 8);
         }
-
-        mac_SCC_reset_done = 1;
-        mac_SCC_init_done = 1;
 }
 #endif /* DEBUG_SERIAL */
 
-void mac_init_scca_port(int cflag)
-{
-        mac_init_scc_port(cflag, 0);
-}
-
-void mac_init_sccb_port(int cflag)
-{
-        mac_init_scc_port(cflag, 1);
-}
-
 static int __init mac_debug_setup(char *arg)
 {
         if (!MACH_IS_MAC)
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 3c943d2ec570..43d83e054b8e 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -30,8 +30,8 @@
 int oss_present;
 volatile struct mac_oss *oss;
 
-irqreturn_t oss_irq(int, void *);
-irqreturn_t oss_nubus_irq(int, void *);
+static irqreturn_t oss_irq(int, void *);
+static irqreturn_t oss_nubus_irq(int, void *);
 
 extern irqreturn_t via1_irq(int, void *);
 extern irqreturn_t mac_scc_dispatch(int, void *);
@@ -92,7 +92,7 @@ void __init oss_nubus_init(void)
  * and SCSI; everything else is routed to its own autovector IRQ.
  */
 
-irqreturn_t oss_irq(int irq, void *dev_id)
+static irqreturn_t oss_irq(int irq, void *dev_id)
 {
         int events;
 
@@ -126,7 +126,7 @@ irqreturn_t oss_irq(int irq, void *dev_id)
  * Unlike the VIA/RBV this is on its own autovector interrupt level.
  */
 
-irqreturn_t oss_nubus_irq(int irq, void *dev_id)
+static irqreturn_t oss_nubus_irq(int irq, void *dev_id)
 {
         int events, irq_bit, i;
 
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c
index d66f723b17c3..f84a4dd64f94 100644
--- a/arch/m68k/mac/psc.c
+++ b/arch/m68k/mac/psc.c
@@ -36,7 +36,7 @@ irqreturn_t psc_irq(int, void *);
  * Debugging dump, used in various places to see what's going on.
  */
 
-void psc_debug_dump(void)
+static void psc_debug_dump(void)
 {
         int     i;
 
@@ -55,7 +55,7 @@ void psc_debug_dump(void)
  * expanded to cover what I think are the other 7 channels.
  */
 
-void psc_dma_die_die_die(void)
+static void psc_dma_die_die_die(void)
 {
         int i;
 
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index fa485df4160e..f3b27d04a31f 100644
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -45,7 +45,7 @@ volatile long *via_memory_bogon=(long *)&via_memory_bogon;
 int rbv_present;
 int via_alt_mapping;
 EXPORT_SYMBOL(via_alt_mapping);
-__u8 rbv_clear;
+static __u8 rbv_clear;
 
 /*
  * Globals for accessing the VIA chip registers without having to
diff --git a/arch/m68k/math-emu/Makefile b/arch/m68k/math-emu/Makefile
index 539940401814..a0935bf98362 100644
--- a/arch/m68k/math-emu/Makefile
+++ b/arch/m68k/math-emu/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_AFLAGS := -traditional
-
 #EXTRA_AFLAGS += -DFPU_EMU_DEBUG
 #EXTRA_CFLAGS += -DFPU_EMU_DEBUG
 
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
index 30d34f285024..226795bdf355 100644
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
@@ -285,7 +285,6 @@ void __init paging_init(void)
          * to a couple of allocated pages
          */
         empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
-        memset(empty_zero_page, 0, PAGE_SIZE);
 
         /*
          * Set up SFC/DFC registers
diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c
index 6a6513aa1ce8..edceefc18870 100644
--- a/arch/m68k/mm/sun3mmu.c
+++ b/arch/m68k/mm/sun3mmu.c
@@ -53,7 +53,6 @@ void __init paging_init(void)
         wp_works_ok = 0;
 #endif
         empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
-        memset(empty_zero_page, 0, PAGE_SIZE);
 
         address = PAGE_OFFSET;
         pg_dir = swapper_pg_dir;
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index 476e18eca758..be9de2f3dc48 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -41,14 +41,12 @@ static void q40_get_model(char *model);
 static int  q40_get_hardware_list(char *buffer);
 extern void q40_sched_init(irq_handler_t handler);
 
-extern unsigned long q40_gettimeoffset(void);
-extern int q40_hwclk(int, struct rtc_time *);
-extern unsigned int q40_get_ss(void);
-extern int q40_set_clock_mmss(unsigned long);
+static unsigned long q40_gettimeoffset(void);
+static int q40_hwclk(int, struct rtc_time *);
+static unsigned int q40_get_ss(void);
+static int q40_set_clock_mmss(unsigned long);
 static int q40_get_rtc_pll(struct rtc_pll_info *pll);
 static int q40_set_rtc_pll(struct rtc_pll_info *pll);
-extern void q40_reset(void);
-void q40_halt(void);
 extern void q40_waitbut(void);
 void q40_set_vectors(void);
 
@@ -127,7 +125,7 @@ static void q40_heartbeat(int on)
 }
 #endif
 
-void q40_reset(void)
+static void q40_reset(void)
 {
         halted = 1;
         printk("\n\n*******************************************\n"
@@ -137,7 +135,8 @@ void q40_reset(void)
         while (1)
                 ;
 }
-void q40_halt(void)
+
+static void q40_halt(void)
 {
         halted = 1;
         printk("\n\n*******************\n"
@@ -165,7 +164,8 @@ static unsigned int serports[] =
 {
         0x3f8,0x2f8,0x3e8,0x2e8,0
 };
-void q40_disable_irqs(void)
+
+static void q40_disable_irqs(void)
 {
         unsigned i, j;
 
@@ -227,7 +227,7 @@ static inline unsigned char bin2bcd(unsigned char b)
 }
 
 
-unsigned long q40_gettimeoffset(void)
+static unsigned long q40_gettimeoffset(void)
 {
         return 5000 * (ql_ticks != 0);
 }
@@ -248,7 +248,7 @@ unsigned long q40_gettimeoffset(void)
  * };
  */
 
-int q40_hwclk(int op, struct rtc_time *t)
+static int q40_hwclk(int op, struct rtc_time *t)
 {
         if (op) {
                 /* Write.... */
@@ -285,7 +285,7 @@ int q40_hwclk(int op, struct rtc_time *t)
         return 0;
 }
 
-unsigned int q40_get_ss(void)
+static unsigned int q40_get_ss(void)
 {
         return bcd2bin(Q40_RTC_SECS);
 }
@@ -295,7 +295,7 @@ unsigned int q40_get_ss(void)
  * clock is out by > 30 minutes.  Logic lifted from atari code.
  */
 
-int q40_set_clock_mmss(unsigned long nowtime)
+static int q40_set_clock_mmss(unsigned long nowtime)
 {
         int retval = 0;
         short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
diff --git a/arch/m68k/sun3/Makefile b/arch/m68k/sun3/Makefile
index be1a8470d636..38ba0e0cedad 100644
--- a/arch/m68k/sun3/Makefile
+++ b/arch/m68k/sun3/Makefile
@@ -2,6 +2,6 @@
 # Makefile for Linux arch/m68k/sun3 source directory
 #
 
-obj-y   := sun3ints.o sun3dvma.o sbus.o idprom.o
+obj-y   := sun3ints.o sun3dvma.o idprom.o
 
 obj-$(CONFIG_SUN3) += config.o mmu_emu.o leds.o dvma.o intersil.o
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c
index c0fbd278fbb1..732087d0735c 100644
--- a/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
@@ -36,7 +36,7 @@ extern char _text, _end;
 char sun3_reserved_pmeg[SUN3_PMEGS_NUM];
 
 extern unsigned long sun3_gettimeoffset(void);
-extern void sun3_sched_init(irq_handler_t handler);
+static void sun3_sched_init(irq_handler_t handler);
 extern void sun3_get_model (char* model);
 extern void idprom_init (void);
 extern int sun3_hwclk(int set, struct rtc_time *t);
@@ -114,7 +114,8 @@ static void sun3_halt (void)
 
 /* sun3 bootmem allocation */
 
-void __init sun3_bootmem_alloc(unsigned long memory_start, unsigned long memory_end)
+static void __init sun3_bootmem_alloc(unsigned long memory_start,
+                                      unsigned long memory_end)
 {
         unsigned long start_page;
 
@@ -164,7 +165,7 @@ void __init config_sun3(void)
         sun3_bootmem_alloc(memory_start, memory_end);
 }
 
-void __init sun3_sched_init(irq_handler_t timer_routine)
+static void __init sun3_sched_init(irq_handler_t timer_routine)
 {
         sun3_disable_interrupts();
         intersil_clock->cmd_reg=(INTERSIL_RUN|INTERSIL_INT_DISABLE|INTERSIL_24H_MODE);
diff --git a/arch/m68k/sun3/dvma.c b/arch/m68k/sun3/dvma.c
index d2b3093f2405..d522eaab4551 100644
--- a/arch/m68k/sun3/dvma.c
+++ b/arch/m68k/sun3/dvma.c
@@ -19,7 +19,7 @@
 
 static unsigned long ptelist[120];
 
-inline unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr)
+static unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr)
 {
         unsigned long pte;
         unsigned long j;
diff --git a/arch/m68k/sun3/idprom.c b/arch/m68k/sun3/idprom.c
index dca6ab6a4ede..c86ac37d1983 100644
--- a/arch/m68k/sun3/idprom.c
+++ b/arch/m68k/sun3/idprom.c
@@ -1,4 +1,4 @@
-/* $Id: idprom.c,v 1.22 1996/11/13 05:09:25 davem Exp $
+/*
  * idprom.c: Routines to load the idprom into kernel addresses and
  *           interpret the data contained within.
  *
@@ -25,7 +25,7 @@ static struct idprom idprom_buffer;
  * of the Sparc CPU and have a meaningful IDPROM machtype value that we
  * know about.  See asm-sparc/machines.h for empirical constants.
  */
-struct Sun_Machine_Models Sun_Machines[NUM_SUN_MACHINES] = {
+static struct Sun_Machine_Models Sun_Machines[NUM_SUN_MACHINES] = {
 /* First, Sun3's */
     { .name = "Sun 3/160 Series",       .id_machtype = (SM_SUN3 | SM_3_160) },
     { .name = "Sun 3/50",               .id_machtype = (SM_SUN3 | SM_3_50) },
diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c
index fb0f6a20cc3c..60f9d4500d72 100644
--- a/arch/m68k/sun3/mmu_emu.c
+++ b/arch/m68k/sun3/mmu_emu.c
@@ -55,7 +55,7 @@ unsigned char pmeg_ctx[PMEGS_NUM];
 
 /* pointers to the mm structs for each task in each
    context. 0xffffffff is a marker for kernel context */
-struct mm_struct *ctx_alloc[CONTEXTS_NUM] = {
+static struct mm_struct *ctx_alloc[CONTEXTS_NUM] = {
     [0] = (struct mm_struct *)0xffffffff
 };
 
diff --git a/arch/m68k/sun3/prom/Makefile b/arch/m68k/sun3/prom/Makefile
index 6e48ae2a7175..da7eac06bca0 100644
--- a/arch/m68k/sun3/prom/Makefile
+++ b/arch/m68k/sun3/prom/Makefile
@@ -1,4 +1,3 @@
-# $Id: Makefile,v 1.5 1995/11/25 00:59:48 davem Exp $
 # Makefile for the Sun Boot PROM interface library under
 # Linux.
 #
diff --git a/arch/m68k/sun3/prom/console.c b/arch/m68k/sun3/prom/console.c
index 52c1427863de..2bcb6e4bfe54 100644
--- a/arch/m68k/sun3/prom/console.c
+++ b/arch/m68k/sun3/prom/console.c
@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.10 1996/12/18 06:46:54 tridge Exp $
+/*
  * console.c: Routines that deal with sending and receiving IO
  *            to/from the current console device using the PROM.
  *
@@ -104,8 +104,6 @@ prom_query_input_device()
                                 return PROMDEV_ITTYB;
                 }
                 return PROMDEV_I_UNK;
-        case PROM_AP1000:
-                return PROMDEV_I_UNK;
         };
 }
 #endif
@@ -166,8 +164,6 @@ prom_query_output_device()
                         };
                 }
                 break;
-        case PROM_AP1000:
-                return PROMDEV_I_UNK;
         };
         return PROMDEV_O_UNK;
 }
diff --git a/arch/m68k/sun3/prom/init.c b/arch/m68k/sun3/prom/init.c
index 202adfcc316e..d8e6349336b4 100644
--- a/arch/m68k/sun3/prom/init.c
+++ b/arch/m68k/sun3/prom/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.9 1996/12/18 06:46:55 tridge Exp $
+/*
  * init.c:  Initialize internal variables used by the PROM
  *          library functions.
  *
@@ -31,11 +31,6 @@ extern void prom_ranges_init(void);
 
 void __init prom_init(struct linux_romvec *rp)
 {
-#ifdef CONFIG_AP1000
-        extern struct linux_romvec *ap_prom_init(void);
-        rp = ap_prom_init();
-#endif
-
         romvec = rp;
 #ifndef CONFIG_SUN3
         switch(romvec->pv_romvers) {
@@ -53,10 +48,6 @@ void __init prom_init(struct linux_romvec *rp)
                 prom_printf("PROMLIB: Sun IEEE Prom not supported yet\n");
                 prom_halt();
                 break;
-        case 42: /* why not :-) */
-                prom_vers = PROM_AP1000;
-                break;
-
         default:
                 prom_printf("PROMLIB: Bad PROM version %d\n",
                             romvec->pv_romvers);
diff --git a/arch/m68k/sun3/prom/misc.c b/arch/m68k/sun3/prom/misc.c
index b88716f2c68c..3d60e1337f75 100644
--- a/arch/m68k/sun3/prom/misc.c
+++ b/arch/m68k/sun3/prom/misc.c
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.15 1997/05/14 20:45:00 davem Exp $
+/*
  * misc.c:  Miscellaneous prom functions that don't belong
  *          anywhere else.
  *
diff --git a/arch/m68k/sun3/prom/printf.c b/arch/m68k/sun3/prom/printf.c
index e7bfde377b5e..df85018f487a 100644
--- a/arch/m68k/sun3/prom/printf.c
+++ b/arch/m68k/sun3/prom/printf.c
@@ -1,4 +1,4 @@
-/* $Id: printf.c,v 1.5 1996/04/04 16:31:07 tridge Exp $
+/*
  * printf.c:  Internal prom library printf facility.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -37,10 +37,6 @@ prom_printf(char *fmt, ...)
 
         bptr = ppbuf;
 
-#ifdef CONFIG_AP1000
-        ap_write(1,bptr,strlen(bptr));
-#else
-
 #ifdef CONFIG_KGDB
         if (kgdb_initialized) {
                 printk("kgdb_initialized = %d\n", kgdb_initialized);
@@ -54,7 +50,6 @@ prom_printf(char *fmt, ...)
                 prom_putchar(ch);
         }
 #endif
-#endif
         va_end(args);
         return;
 }
diff --git a/arch/m68k/sun3/sbus.c b/arch/m68k/sun3/sbus.c
deleted file mode 100644
index babdbfa3cda7..000000000000
--- a/arch/m68k/sun3/sbus.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * SBus helper functions
- *
- * Sun3 don't have a sbus, but many of the used devices are also
- * used on Sparc machines with sbus. To avoid having a lot of
- * duplicate code, we provide necessary glue stuff to make using
- * of the sbus driver code possible.
- *
- * (C) 1999 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
- */
-
-#include <linux/types.h>
-#include <linux/compiler.h>
-#include <linux/init.h>
-
-int __init sbus_init(void)
-{
-        return 0;
-}
-
-void *sparc_alloc_io (u32 address, void *virtual, int len, char *name,
-                      u32 bus_type, int rdonly)
-{
-        return (void *)address;
-}
-
-subsys_initcall(sbus_init);
diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c
index 8709677fa025..f9277e8b4159 100644
--- a/arch/m68k/sun3/sun3dvma.c
+++ b/arch/m68k/sun3/sun3dvma.c
@@ -29,7 +29,7 @@ static inline void dvma_unmap_iommu(unsigned long a, int b)
 extern void sun3_dvma_init(void);
 #endif
 
-unsigned long iommu_use[IOMMU_TOTAL_ENTRIES];
+static unsigned long iommu_use[IOMMU_TOTAL_ENTRIES];
 
 #define dvma_index(baddr) ((baddr - DVMA_START) >> DVMA_PAGE_SHIFT)
 
diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c
index cf93481adb1d..7364cd67455e 100644
--- a/arch/m68k/sun3/sun3ints.c
+++ b/arch/m68k/sun3/sun3ints.c
@@ -30,7 +30,7 @@ void sun3_enable_interrupts(void)
         sun3_enable_irq(0);
 }
 
-int led_pattern[8] = {
+static int led_pattern[8] = {
        ~(0x80), ~(0x01),
        ~(0x40), ~(0x02),
        ~(0x20), ~(0x04),
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index b9c268c6b2fb..8b054e7a8ae8 100644
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -392,7 +392,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask)
 static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
 {
         struct uart_icount *icount = &port->uart.icount;
-        struct tty_struct *tty = port->uart.info->tty;
+        struct tty_struct *tty = port->uart.info->port.tty;
         unsigned ix;
         int count;
         u8 st, ch, push, status, overrun;
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index e6caf5d42e0e..61b6c5beb2d3 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -380,9 +380,6 @@ static int __init bay_init(void)
         if (acpi_disabled)
                 return -ENODEV;
 
-        if (acpi_disabled)
-                return -ENODEV;
-
         /* look for dockable drive bays */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                 ACPI_UINT32_MAX, find_bay, &bays, NULL);
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 1e872e79db33..bb7c51f712bd 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -920,9 +920,6 @@ static int __init dock_init(void)
         if (acpi_disabled)
                 return 0;
 
-        if (acpi_disabled)
-                return 0;
-
         /* look for a dock station */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
                             ACPI_UINT32_MAX, find_dock, &num, NULL);
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 0f2dd81736bd..2f173e83f8a7 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -338,9 +338,6 @@ static int __init acpi_rtc_init(void)
         if (acpi_disabled)
                 return 0;
 
-        if (acpi_disabled)
-                return 0;
-
         if (dev) {
                 rtc_wake_setup();
                 rtc_info.wake_on = rtc_wake_on;
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 424995073c6b..49f274197b16 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1880,11 +1880,11 @@ static int __init atari_floppy_init (void)
 
         if (!MACH_IS_ATARI)
                 /* Amiga, Mac, ... don't have Atari-compatible floppy :-) */
-                return -ENXIO;
+                return -ENODEV;
 
         if (MACH_IS_HADES)
                 /* Hades doesn't have Atari-compatible floppy */
-                return -ENXIO;
+                return -ENODEV;
 
         if (register_blkdev(FLOPPY_MAJOR,"fd"))
                 return -EBUSY;
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index e5cd856a2fea..69df187d74ce 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -282,8 +282,8 @@ static int hci_uart_tty_open(struct tty_struct *tty)
         /* FIXME: why is this needed. Note don't use ldisc_ref here as the
            open path is before the ldisc is referencable */
 
-        if (tty->ldisc.flush_buffer)
-                tty->ldisc.flush_buffer(tty);
+        if (tty->ldisc.ops->flush_buffer)
+                tty->ldisc.ops->flush_buffer(tty);
         tty_driver_flush_buffer(tty);
 
         return 0;
@@ -514,7 +514,7 @@ static unsigned int hci_uart_tty_poll(struct tty_struct *tty,
 
 static int __init hci_uart_init(void)
 {
-        static struct tty_ldisc hci_uart_ldisc;
+        static struct tty_ldisc_ops hci_uart_ldisc;
         int err;
 
         BT_INFO("HCI UART driver ver %s", VERSION);
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 6bff9d87dc57..e991dc85f2fb 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -762,7 +762,7 @@ static int cy_next_channel;	/* next minor available */
 /*
  * This is used to look up the divisor speeds and the timeouts
  * We're normally limited to 15 distinct baud rates.  The extra
- * are accessed via settings in info->flags.
+ * are accessed via settings in info->port.flags.
  *      0,     1,     2,     3,     4,     5,     6,     7,     8,     9,
  *     10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
  *                                               HI            VHI
@@ -1003,7 +1003,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
         cy_writeb(base_addr + (CyCAR << index), save_xir);
 
         /* if there is nowhere to put the data, discard it */
-        if (info->tty == NULL) {
+        if (info->port.tty == NULL) {
                 if ((readb(base_addr + (CyRIVR << index)) & CyIVRMask) ==
                                 CyIVRRxEx) {    /* exception */
                         data = readb(base_addr + (CyRDSR << index));
@@ -1015,7 +1015,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
                 goto end;
         }
         /* there is an open port for this data */
-        tty = info->tty;
+        tty = info->port.tty;
         if ((readb(base_addr + (CyRIVR << index)) & CyIVRMask) ==
                         CyIVRRxEx) {    /* exception */
                 data = readb(base_addr + (CyRDSR << index));
@@ -1041,7 +1041,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
                                                 readb(base_addr + (CyRDSR <<
                                                         index)), TTY_BREAK);
                                         info->icount.rx++;
-                                        if (info->flags & ASYNC_SAK)
+                                        if (info->port.flags & ASYNC_SAK)
                                                 do_SAK(tty);
                                 } else if (data & CyFRAME) {
                                         tty_insert_flip_char(tty,
@@ -1145,7 +1145,7 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
                 goto end;
         }
         info = &cinfo->ports[channel + chip * 4];
-        if (info->tty == NULL) {
+        if (info->port.tty == NULL) {
                 cy_writeb(base_addr + (CySRER << index),
                           readb(base_addr + (CySRER << index)) & ~CyTxRdy);
                 goto end;
@@ -1190,13 +1190,13 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
                         }
                         goto done;
                 }
-                if (info->xmit_buf == NULL) {
+                if (info->port.xmit_buf == NULL) {
                         cy_writeb(base_addr + (CySRER << index),
                                 readb(base_addr + (CySRER << index)) &
                                         ~CyTxRdy);
                         goto done;
                 }
-                if (info->tty->stopped || info->tty->hw_stopped) {
+                if (info->port.tty->stopped || info->port.tty->hw_stopped) {
                         cy_writeb(base_addr + (CySRER << index),
                                 readb(base_addr + (CySRER << index)) &
                                         ~CyTxRdy);
@@ -1211,7 +1211,7 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
                  * character. This is necessary because there may not be room
                  * for the two chars needed to send a NULL.)
                  */
-                outch = info->xmit_buf[info->xmit_tail];
+                outch = info->port.xmit_buf[info->xmit_tail];
                 if (outch) {
                         info->xmit_cnt--;
                         info->xmit_tail = (info->xmit_tail + 1) &
@@ -1232,7 +1232,7 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
         }
 
 done:
-        tty_wakeup(info->tty);
+        tty_wakeup(info->port.tty);
 end:
         /* end of service */
         cy_writeb(base_addr + (CyTIR << index), save_xir & 0x3f);
@@ -1256,7 +1256,7 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
         mdm_change = readb(base_addr + (CyMISR << index));
         mdm_status = readb(base_addr + (CyMSVR1 << index));
 
-        if (!info->tty)
+        if (!info->port.tty)
                 goto end;
 
         if (mdm_change & CyANY_DELTA) {
@@ -1273,29 +1273,29 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
                 wake_up_interruptible(&info->delta_msr_wait);
         }
 
-        if ((mdm_change & CyDCD) && (info->flags & ASYNC_CHECK_CD)) {
+        if ((mdm_change & CyDCD) && (info->port.flags & ASYNC_CHECK_CD)) {
                 if (!(mdm_status & CyDCD)) {
-                        tty_hangup(info->tty);
-                        info->flags &= ~ASYNC_NORMAL_ACTIVE;
+                        tty_hangup(info->port.tty);
+                        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
                 }
-                wake_up_interruptible(&info->open_wait);
+                wake_up_interruptible(&info->port.open_wait);
         }
-        if ((mdm_change & CyCTS) && (info->flags & ASYNC_CTS_FLOW)) {
-                if (info->tty->hw_stopped) {
+        if ((mdm_change & CyCTS) && (info->port.flags & ASYNC_CTS_FLOW)) {
+                if (info->port.tty->hw_stopped) {
                         if (mdm_status & CyCTS) {
                                 /* cy_start isn't used
                                    because... !!! */
-                                info->tty->hw_stopped = 0;
+                                info->port.tty->hw_stopped = 0;
                                 cy_writeb(base_addr + (CySRER << index),
                                         readb(base_addr + (CySRER << index)) |
                                                 CyTxRdy);
-                                tty_wakeup(info->tty);
+                                tty_wakeup(info->port.tty);
                         }
                 } else {
                         if (!(mdm_status & CyCTS)) {
                                 /* cy_stop isn't used
                                    because ... !!! */
-                                info->tty->hw_stopped = 1;
+                                info->port.tty->hw_stopped = 1;
                                 cy_writeb(base_addr + (CySRER << index),
                                         readb(base_addr + (CySRER << index)) &
                                                 ~CyTxRdy);
@@ -1449,7 +1449,7 @@ static void cyz_handle_rx(struct cyclades_port *info,
                 struct BUF_CTRL __iomem *buf_ctrl)
 {
         struct cyclades_card *cinfo = info->card;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         unsigned int char_count;
         int len;
 #ifdef BLOCKMOVE
@@ -1542,7 +1542,7 @@ static void cyz_handle_tx(struct cyclades_port *info,
                 struct BUF_CTRL __iomem *buf_ctrl)
 {
         struct cyclades_card *cinfo = info->card;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         u8 data;
         unsigned int char_count;
 #ifdef BLOCKMOVE
@@ -1585,7 +1585,7 @@ static void cyz_handle_tx(struct cyclades_port *info,
 
                         memcpy_toio((char *)(cinfo->base_addr + tx_bufaddr +
                                         tx_put),
-                                        &info->xmit_buf[info->xmit_tail],
+                                        &info->port.xmit_buf[info->xmit_tail],
                                         small_count);
 
                         tx_put = (tx_put + small_count) & (tx_bufsize - 1);
@@ -1597,7 +1597,7 @@ static void cyz_handle_tx(struct cyclades_port *info,
                 }
 #else
                 while (info->xmit_cnt && char_count) {
-                        data = info->xmit_buf[info->xmit_tail];
+                        data = info->port.xmit_buf[info->xmit_tail];
                         info->xmit_cnt--;
                         info->xmit_tail = (info->xmit_tail + 1) &
                                         (SERIAL_XMIT_SIZE - 1);
@@ -1642,7 +1642,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                 special_count = 0;
                 delta_count = 0;
                 info = &cinfo->ports[channel];
-                tty = info->tty;
+                tty = info->port.tty;
                 if (tty == NULL)
                         continue;
 
@@ -1668,15 +1668,15 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                 case C_CM_MDCD:
                         info->icount.dcd++;
                         delta_count++;
-                        if (info->flags & ASYNC_CHECK_CD) {
+                        if (info->port.flags & ASYNC_CHECK_CD) {
                                 if ((fw_ver > 241 ? ((u_long) param) :
                                                 readl(&ch_ctrl->rs_status)) &
                                                 C_RS_DCD) {
-                                        wake_up_interruptible(&info->open_wait);
+                                        wake_up_interruptible(&info->port.open_wait);
                                 } else {
-                                        tty_hangup(info->tty);
-                                        wake_up_interruptible(&info->open_wait);
-                                        info->flags &= ~ASYNC_NORMAL_ACTIVE;
+                                        tty_hangup(info->port.tty);
+                                        wake_up_interruptible(&info->port.open_wait);
+                                        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
                                 }
                         }
                         break;
@@ -1814,7 +1814,7 @@ static void cyz_poll(unsigned long arg)
 
                 for (port = 0; port < cinfo->nports; port++) {
                         info = &cinfo->ports[port];
-                        tty = info->tty;
+                        tty = info->port.tty;
                         buf_ctrl = &(zfw_ctrl->buf_ctrl[port]);
 
                         if (!info->throttle)
@@ -1853,22 +1853,22 @@ static int startup(struct cyclades_port *info)
 
         spin_lock_irqsave(&card->card_lock, flags);
 
-        if (info->flags & ASYNC_INITIALIZED) {
+        if (info->port.flags & ASYNC_INITIALIZED) {
                 free_page(page);
                 goto errout;
         }
 
         if (!info->type) {
-                if (info->tty)
-                        set_bit(TTY_IO_ERROR, &info->tty->flags);
+                if (info->port.tty)
+                        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
                 free_page(page);
                 goto errout;
         }
 
-        if (info->xmit_buf)
+        if (info->port.xmit_buf)
                 free_page(page);
         else
-                info->xmit_buf = (unsigned char *)page;
+                info->port.xmit_buf = (unsigned char *)page;
 
         spin_unlock_irqrestore(&card->card_lock, flags);
 
@@ -1909,10 +1909,10 @@ static int startup(struct cyclades_port *info)
 
                 cy_writeb(base_addr + (CySRER << index),
                         readb(base_addr + (CySRER << index)) | CyRxData);
-                info->flags |= ASYNC_INITIALIZED;
+                info->port.flags |= ASYNC_INITIALIZED;
 
-                if (info->tty)
-                        clear_bit(TTY_IO_ERROR, &info->tty->flags);
+                if (info->port.tty)
+                        clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
                 info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
                 info->breakon = info->breakoff = 0;
                 memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
@@ -1994,9 +1994,9 @@ static int startup(struct cyclades_port *info)
 
                 /* enable send, recv, modem !!! */
 
-                info->flags |= ASYNC_INITIALIZED;
-                if (info->tty)
-                        clear_bit(TTY_IO_ERROR, &info->tty->flags);
+                info->port.flags |= ASYNC_INITIALIZED;
+                if (info->port.tty)
+                        clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
                 info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
                 info->breakon = info->breakoff = 0;
                 memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
@@ -2065,7 +2065,7 @@ static void shutdown(struct cyclades_port *info)
         void __iomem *base_addr;
         int chip, channel, index;
 
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 return;
 
         card = info->card;
@@ -2087,14 +2087,14 @@ static void shutdown(struct cyclades_port *info)
                 /* Clear delta_msr_wait queue to avoid mem leaks. */
                 wake_up_interruptible(&info->delta_msr_wait);
 
-                if (info->xmit_buf) {
+                if (info->port.xmit_buf) {
                         unsigned char *temp;
-                        temp = info->xmit_buf;
-                        info->xmit_buf = NULL;
+                        temp = info->port.xmit_buf;
+                        info->port.xmit_buf = NULL;
                         free_page((unsigned long)temp);
                 }
                 cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-                if (!info->tty || (info->tty->termios->c_cflag & HUPCL)) {
+                if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL)) {
                         cy_writeb(base_addr + (CyMSVR1 << index), ~CyRTS);
                         cy_writeb(base_addr + (CyMSVR2 << index), ~CyDTR);
 #ifdef CY_DEBUG_DTR
@@ -2108,9 +2108,9 @@ static void shutdown(struct cyclades_port *info)
                 /* it may be appropriate to clear _XMIT at
                    some later date (after testing)!!! */
 
-                if (info->tty)
-                        set_bit(TTY_IO_ERROR, &info->tty->flags);
-                info->flags &= ~ASYNC_INITIALIZED;
+                if (info->port.tty)
+                        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+                info->port.flags &= ~ASYNC_INITIALIZED;
                 spin_unlock_irqrestore(&card->card_lock, flags);
         } else {
                 struct FIRM_ID __iomem *firm_id;
@@ -2136,14 +2136,14 @@ static void shutdown(struct cyclades_port *info)
 
                 spin_lock_irqsave(&card->card_lock, flags);
 
-                if (info->xmit_buf) {
+                if (info->port.xmit_buf) {
                         unsigned char *temp;
-                        temp = info->xmit_buf;
-                        info->xmit_buf = NULL;
+                        temp = info->port.xmit_buf;
+                        info->port.xmit_buf = NULL;
                         free_page((unsigned long)temp);
                 }
 
-                if (!info->tty || (info->tty->termios->c_cflag & HUPCL)) {
+                if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL)) {
                         cy_writel(&ch_ctrl[channel].rs_control,
                                 (__u32)(readl(&ch_ctrl[channel].rs_control) &
                                         ~(C_RS_RTS | C_RS_DTR)));
@@ -2158,9 +2158,9 @@ static void shutdown(struct cyclades_port *info)
 #endif
                 }
 
-                if (info->tty)
-                        set_bit(TTY_IO_ERROR, &info->tty->flags);
-                info->flags &= ~ASYNC_INITIALIZED;
+                if (info->port.tty)
+                        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+                info->port.flags &= ~ASYNC_INITIALIZED;
 
                 spin_unlock_irqrestore(&card->card_lock, flags);
         }
@@ -2194,10 +2194,10 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
          * If the device is in the middle of being closed, then block
          * until it's done, and then try again.
          */
-        if (tty_hung_up_p(filp) || (info->flags & ASYNC_CLOSING)) {
-                wait_event_interruptible(info->close_wait,
-                                !(info->flags & ASYNC_CLOSING));
-                return (info->flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
+        if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {
+                wait_event_interruptible(info->port.close_wait,
+                                !(info->port.flags & ASYNC_CLOSING));
+                return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
         }
 
         /*
@@ -2206,32 +2206,32 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
          */
         if ((filp->f_flags & O_NONBLOCK) ||
                                         (tty->flags & (1 << TTY_IO_ERROR))) {
-                info->flags |= ASYNC_NORMAL_ACTIVE;
+                info->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
 
         /*
          * Block waiting for the carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
-         * this loop, info->count is dropped by one, so that
+         * this loop, info->port.count is dropped by one, so that
          * cy_close() knows when to free things.  We restore it upon
          * exit, either normal or abnormal.
          */
         retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
+        add_wait_queue(&info->port.open_wait, &wait);
 #ifdef CY_DEBUG_OPEN
         printk(KERN_DEBUG "cyc block_til_ready before block: ttyC%d, "
-                "count = %d\n", info->line, info->count);
+                "count = %d\n", info->line, info->port.count);
 #endif
         spin_lock_irqsave(&cinfo->card_lock, flags);
         if (!tty_hung_up_p(filp))
-                info->count--;
+                info->port.count--;
         spin_unlock_irqrestore(&cinfo->card_lock, flags);
 #ifdef CY_DEBUG_COUNT
         printk(KERN_DEBUG "cyc block_til_ready: (%d): decrementing count to "
-                "%d\n", current->pid, info->count);
+                "%d\n", current->pid, info->port.count);
 #endif
-        info->blocked_open++;
+        info->port.blocked_open++;
 
         if (!IS_CYC_Z(*cinfo)) {
                 chip = channel >> 2;
@@ -2260,8 +2260,8 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
 
                         set_current_state(TASK_INTERRUPTIBLE);
                         if (tty_hung_up_p(filp) ||
-                                        !(info->flags & ASYNC_INITIALIZED)) {
-                                retval = ((info->flags & ASYNC_HUP_NOTIFY) ?
+                                        !(info->port.flags & ASYNC_INITIALIZED)) {
+                                retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
                                           -EAGAIN : -ERESTARTSYS);
                                 break;
                         }
@@ -2269,7 +2269,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                         spin_lock_irqsave(&cinfo->card_lock, flags);
                         cy_writeb(base_addr + (CyCAR << index),
                                   (u_char) channel);
-                        if (!(info->flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
+                        if (!(info->port.flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
                                         (readb(base_addr +
                                                 (CyMSVR1 << index)) & CyDCD))) {
                                 spin_unlock_irqrestore(&cinfo->card_lock, flags);
@@ -2284,7 +2284,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
 #ifdef CY_DEBUG_OPEN
                         printk(KERN_DEBUG "cyc block_til_ready blocking: "
                                 "ttyC%d, count = %d\n",
-                                info->line, info->count);
+                                info->line, info->port.count);
 #endif
                         schedule();
                 }
@@ -2298,7 +2298,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                 firm_id = base_addr + ID_ADDRESS;
                 if (!ISZLOADED(*cinfo)) {
                         __set_current_state(TASK_RUNNING);
-                        remove_wait_queue(&info->open_wait, &wait);
+                        remove_wait_queue(&info->port.open_wait, &wait);
                         return -EINVAL;
                 }
 
@@ -2327,12 +2327,12 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
 
                         set_current_state(TASK_INTERRUPTIBLE);
                         if (tty_hung_up_p(filp) ||
-                                        !(info->flags & ASYNC_INITIALIZED)) {
-                                retval = ((info->flags & ASYNC_HUP_NOTIFY) ?
+                                        !(info->port.flags & ASYNC_INITIALIZED)) {
+                                retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
                                           -EAGAIN : -ERESTARTSYS);
                                 break;
                         }
-                        if (!(info->flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
+                        if (!(info->port.flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
                                         (readl(&ch_ctrl[channel].rs_status) &
                                                 C_RS_DCD))) {
                                 break;
@@ -2344,28 +2344,28 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
 #ifdef CY_DEBUG_OPEN
                         printk(KERN_DEBUG "cyc block_til_ready blocking: "
                                 "ttyC%d, count = %d\n",
-                                info->line, info->count);
+                                info->line, info->port.count);
 #endif
                         schedule();
                 }
         }
         __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
+        remove_wait_queue(&info->port.open_wait, &wait);
         if (!tty_hung_up_p(filp)) {
-                info->count++;
+                info->port.count++;
 #ifdef CY_DEBUG_COUNT
                 printk(KERN_DEBUG "cyc:block_til_ready (%d): incrementing "
-                        "count to %d\n", current->pid, info->count);
+                        "count to %d\n", current->pid, info->port.count);
 #endif
         }
-        info->blocked_open--;
+        info->port.blocked_open--;
 #ifdef CY_DEBUG_OPEN
         printk(KERN_DEBUG "cyc:block_til_ready after blocking: ttyC%d, "
-                "count = %d\n", info->line, info->count);
+                "count = %d\n", info->line, info->port.count);
 #endif
         if (retval)
                 return retval;
-        info->flags |= ASYNC_NORMAL_ACTIVE;
+        info->port.flags |= ASYNC_NORMAL_ACTIVE;
         return 0;
 }                               /* block_til_ready */
 
@@ -2456,27 +2456,27 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
         printk(KERN_DEBUG "cyc:cy_open ttyC%d\n", info->line);
 #endif
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
         if (serial_paranoia_check(info, tty->name, "cy_open"))
                 return -ENODEV;
 
 #ifdef CY_DEBUG_OPEN
         printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
-                        info->count);
+                        info->port.count);
 #endif
-        info->count++;
+        info->port.count++;
 #ifdef CY_DEBUG_COUNT
         printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
-                current->pid, info->count);
+                current->pid, info->port.count);
 #endif
 
         /*
          * If the port is the middle of closing, bail out now
          */
-        if (tty_hung_up_p(filp) || (info->flags & ASYNC_CLOSING)) {
-                wait_event_interruptible(info->close_wait,
-                                !(info->flags & ASYNC_CLOSING));
-                return (info->flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
+        if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {
+                wait_event_interruptible(info->port.close_wait,
+                                !(info->port.flags & ASYNC_CLOSING));
+                return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
         }
 
         /*
@@ -2641,9 +2641,9 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
         }
 #ifdef CY_DEBUG_OPEN
         printk(KERN_DEBUG "cyc:cy_close ttyC%d, count = %d\n", info->line,
-                info->count);
+                info->port.count);
 #endif
-        if ((tty->count == 1) && (info->count != 1)) {
+        if ((tty->count == 1) && (info->port.count != 1)) {
                 /*
                  * Uh, oh.  tty->count is 1, which means that the tty
                  * structure will be freed.  Info->count should always
@@ -2652,24 +2652,24 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
                  * serial port won't be shutdown.
                  */
                 printk(KERN_ERR "cyc:cy_close: bad serial port count; "
-                        "tty->count is 1, info->count is %d\n", info->count);
-                info->count = 1;
+                        "tty->count is 1, info->port.count is %d\n", info->port.count);
+                info->port.count = 1;
         }
 #ifdef CY_DEBUG_COUNT
         printk(KERN_DEBUG  "cyc:cy_close at (%d): decrementing count to %d\n",
-                current->pid, info->count - 1);
+                current->pid, info->port.count - 1);
 #endif
-        if (--info->count < 0) {
+        if (--info->port.count < 0) {
 #ifdef CY_DEBUG_COUNT
                 printk(KERN_DEBUG "cyc:cyc_close setting count to 0\n");
 #endif
-                info->count = 0;
+                info->port.count = 0;
         }
-        if (info->count) {
+        if (info->port.count) {
                 spin_unlock_irqrestore(&card->card_lock, flags);
                 return;
         }
-        info->flags |= ASYNC_CLOSING;
+        info->port.flags |= ASYNC_CLOSING;
 
         /*
          * Now we wait for the transmit buffer to clear; and we notify
@@ -2677,8 +2677,8 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
          */
         tty->closing = 1;
         spin_unlock_irqrestore(&card->card_lock, flags);
-        if (info->closing_wait != CY_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, info->closing_wait);
+        if (info->port.closing_wait != CY_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, info->port.closing_wait);
 
         spin_lock_irqsave(&card->card_lock, flags);
 
@@ -2692,7 +2692,7 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
                 cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
                 cy_writeb(base_addr + (CySRER << index),
                           readb(base_addr + (CySRER << index)) & ~CyRxData);
-                if (info->flags & ASYNC_INITIALIZED) {
+                if (info->port.flags & ASYNC_INITIALIZED) {
                         /* Waiting for on-board buffers to be empty before
                            closing the port */
                         spin_unlock_irqrestore(&card->card_lock, flags);
@@ -2731,18 +2731,18 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
         spin_lock_irqsave(&card->card_lock, flags);
 
         tty->closing = 0;
-        info->tty = NULL;
-        if (info->blocked_open) {
+        info->port.tty = NULL;
+        if (info->port.blocked_open) {
                 spin_unlock_irqrestore(&card->card_lock, flags);
-                if (info->close_delay) {
+                if (info->port.close_delay) {
                         msleep_interruptible(jiffies_to_msecs
-                                                (info->close_delay));
+                                                (info->port.close_delay));
                 }
-                wake_up_interruptible(&info->open_wait);
+                wake_up_interruptible(&info->port.open_wait);
                 spin_lock_irqsave(&card->card_lock, flags);
         }
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
-        wake_up_interruptible(&info->close_wait);
+        info->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
+        wake_up_interruptible(&info->port.close_wait);
 
 #ifdef CY_DEBUG_OTHER
         printk(KERN_DEBUG "cyc:cy_close done\n");
@@ -2777,7 +2777,7 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
         if (serial_paranoia_check(info, tty->name, "cy_write"))
                 return 0;
 
-        if (!info->xmit_buf)
+        if (!info->port.xmit_buf)
                 return 0;
 
         spin_lock_irqsave(&info->card->card_lock, flags);
@@ -2788,7 +2788,7 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
                 if (c <= 0)
                         break;
 
-                memcpy(info->xmit_buf + info->xmit_head, buf, c);
+                memcpy(info->port.xmit_buf + info->xmit_head, buf, c);
                 info->xmit_head = (info->xmit_head + c) &
                         (SERIAL_XMIT_SIZE - 1);
                 info->xmit_cnt += c;
@@ -2826,7 +2826,7 @@ static int cy_put_char(struct tty_struct *tty, unsigned char ch)
         if (serial_paranoia_check(info, tty->name, "cy_put_char"))
                 return 0;
 
-        if (!info->xmit_buf)
+        if (!info->port.xmit_buf)
                 return 0;
 
         spin_lock_irqsave(&info->card->card_lock, flags);
@@ -2835,7 +2835,7 @@ static int cy_put_char(struct tty_struct *tty, unsigned char ch)
                 return 0;
         }
 
-        info->xmit_buf[info->xmit_head++] = ch;
+        info->port.xmit_buf[info->xmit_head++] = ch;
         info->xmit_head &= SERIAL_XMIT_SIZE - 1;
         info->xmit_cnt++;
         info->idle_stats.xmit_bytes++;
@@ -2860,7 +2860,7 @@ static void cy_flush_chars(struct tty_struct *tty)
                 return;
 
         if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-                        !info->xmit_buf)
+                        !info->port.xmit_buf)
                 return;
 
         start_xmit(info);
@@ -2988,27 +2988,27 @@ static void set_line_char(struct cyclades_port *info)
         int baud, baud_rate = 0;
         int i;
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
 
         if (info->line == -1)
                 return;
 
-        cflag = info->tty->termios->c_cflag;
-        iflag = info->tty->termios->c_iflag;
+        cflag = info->port.tty->termios->c_cflag;
+        iflag = info->port.tty->termios->c_iflag;
 
         /*
          * Set up the tty->alt_speed kludge
          */
-        if (info->tty) {
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        info->tty->alt_speed = 57600;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        info->tty->alt_speed = 115200;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                        info->tty->alt_speed = 230400;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                        info->tty->alt_speed = 460800;
+        if (info->port.tty) {
+                if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                        info->port.tty->alt_speed = 57600;
+                if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                        info->port.tty->alt_speed = 115200;
+                if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                        info->port.tty->alt_speed = 230400;
+                if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                        info->port.tty->alt_speed = 460800;
         }
 
         card = info->card;
@@ -3020,8 +3020,8 @@ static void set_line_char(struct cyclades_port *info)
                 index = card->bus_index;
 
                 /* baud rate */
-                baud = tty_get_baud_rate(info->tty);
-                if (baud == 38400 && (info->flags & ASYNC_SPD_MASK) ==
+                baud = tty_get_baud_rate(info->port.tty);
+                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
                                 ASYNC_SPD_CUST) {
                         if (info->custom_divisor)
                                 baud_rate = info->baud / info->custom_divisor;
@@ -3038,7 +3038,7 @@ static void set_line_char(struct cyclades_port *info)
                 if (i == 20)
                         i = 19; /* CD1400_MAX_SPEED */
 
-                if (baud == 38400 && (info->flags & ASYNC_SPD_MASK) ==
+                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
                                 ASYNC_SPD_CUST) {
                         cyy_baud_calc(info, baud_rate);
                 } else {
@@ -3059,7 +3059,7 @@ static void set_line_char(struct cyclades_port *info)
                         /* get it right for 134.5 baud */
                         info->timeout = (info->xmit_fifo_size * HZ * 30 / 269) +
                                         2;
-                } else if (baud == 38400 && (info->flags & ASYNC_SPD_MASK) ==
+                } else if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
                                 ASYNC_SPD_CUST) {
                         info->timeout = (info->xmit_fifo_size * HZ * 15 /
                                         baud_rate) + 2;
@@ -3108,16 +3108,16 @@ static void set_line_char(struct cyclades_port *info)
 
                 /* CTS flow control flag */
                 if (cflag & CRTSCTS) {
-                        info->flags |= ASYNC_CTS_FLOW;
+                        info->port.flags |= ASYNC_CTS_FLOW;
                         info->cor2 |= CyCtsAE;
                 } else {
-                        info->flags &= ~ASYNC_CTS_FLOW;
+                        info->port.flags &= ~ASYNC_CTS_FLOW;
                         info->cor2 &= ~CyCtsAE;
                 }
                 if (cflag & CLOCAL)
-                        info->flags &= ~ASYNC_CHECK_CD;
+                        info->port.flags &= ~ASYNC_CHECK_CD;
                 else
-                        info->flags |= ASYNC_CHECK_CD;
+                        info->port.flags |= ASYNC_CHECK_CD;
 
          /***********************************************
             The hardware option, CyRtsAO, presents RTS when
@@ -3146,8 +3146,8 @@ static void set_line_char(struct cyclades_port *info)
                 /* set line characteristics  according configuration */
 
                 cy_writeb(base_addr + (CySCHR1 << index),
-                          START_CHAR(info->tty));
-                cy_writeb(base_addr + (CySCHR2 << index), STOP_CHAR(info->tty));
+                          START_CHAR(info->port.tty));
+                cy_writeb(base_addr + (CySCHR2 << index), STOP_CHAR(info->port.tty));
                 cy_writeb(base_addr + (CyCOR1 << index), info->cor1);
                 cy_writeb(base_addr + (CyCOR2 << index), info->cor2);
                 cy_writeb(base_addr + (CyCOR3 << index), info->cor3);
@@ -3163,7 +3163,7 @@ static void set_line_char(struct cyclades_port *info)
                         (info->default_timeout ? info->default_timeout : 0x02));
                 /* 10ms rx timeout */
 
-                if (C_CLOCAL(info->tty)) {
+                if (C_CLOCAL(info->port.tty)) {
                         /* without modem intr */
                         cy_writeb(base_addr + (CySRER << index),
                                 readb(base_addr + (CySRER << index)) | CyMdmCh);
@@ -3226,8 +3226,8 @@ static void set_line_char(struct cyclades_port *info)
 #endif
                 }
 
-                if (info->tty)
-                        clear_bit(TTY_IO_ERROR, &info->tty->flags);
+                if (info->port.tty)
+                        clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
                 spin_unlock_irqrestore(&card->card_lock, flags);
 
         } else {
@@ -3250,8 +3250,8 @@ static void set_line_char(struct cyclades_port *info)
                 buf_ctrl = &zfw_ctrl->buf_ctrl[channel];
 
                 /* baud rate */
-                baud = tty_get_baud_rate(info->tty);
-                if (baud == 38400 && (info->flags & ASYNC_SPD_MASK) ==
+                baud = tty_get_baud_rate(info->port.tty);
+                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
                                 ASYNC_SPD_CUST) {
                         if (info->custom_divisor)
                                 baud_rate = info->baud / info->custom_divisor;
@@ -3266,7 +3266,7 @@ static void set_line_char(struct cyclades_port *info)
                         /* get it right for 134.5 baud */
                         info->timeout = (info->xmit_fifo_size * HZ * 30 / 269) +
                                         2;
-                } else if (baud == 38400 && (info->flags & ASYNC_SPD_MASK) ==
+                } else if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
                                 ASYNC_SPD_CUST) {
                         info->timeout = (info->xmit_fifo_size * HZ * 15 /
                                         baud_rate) + 2;
@@ -3318,7 +3318,7 @@ static void set_line_char(struct cyclades_port *info)
                 }
                 /* As the HW flow control is done in firmware, the driver
                    doesn't need to care about it */
-                info->flags &= ~ASYNC_CTS_FLOW;
+                info->port.flags &= ~ASYNC_CTS_FLOW;
 
                 /* XON/XOFF/XANY flow control flags */
                 sw_flow = 0;
@@ -3337,9 +3337,9 @@ static void set_line_char(struct cyclades_port *info)
 
                 /* CD sensitivity */
                 if (cflag & CLOCAL)
-                        info->flags &= ~ASYNC_CHECK_CD;
+                        info->port.flags &= ~ASYNC_CHECK_CD;
                 else
-                        info->flags |= ASYNC_CHECK_CD;
+                        info->port.flags |= ASYNC_CHECK_CD;
 
                 if (baud == 0) {        /* baud rate is zero, turn off line */
                         cy_writel(&ch_ctrl->rs_control,
@@ -3361,8 +3361,8 @@ static void set_line_char(struct cyclades_port *info)
                                 "was %x\n", info->line, retval);
                 }
 
-                if (info->tty)
-                        clear_bit(TTY_IO_ERROR, &info->tty->flags);
+                if (info->port.tty)
+                        clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
         }
 }                               /* set_line_char */
 
@@ -3381,9 +3381,9 @@ get_serial_info(struct cyclades_port *info,
         tmp.port = (info->card - cy_card) * 0x100 + info->line -
                 cinfo->first_line;
         tmp.irq = cinfo->irq;
-        tmp.flags = info->flags;
-        tmp.close_delay = info->close_delay;
-        tmp.closing_wait = info->closing_wait;
+        tmp.flags = info->port.flags;
+        tmp.close_delay = info->port.close_delay;
+        tmp.closing_wait = info->port.closing_wait;
         tmp.baud_base = info->baud;
         tmp.custom_divisor = info->custom_divisor;
         tmp.hub6 = 0;           /*!!! */
@@ -3402,13 +3402,13 @@ set_serial_info(struct cyclades_port *info,
         old_info = *info;
 
         if (!capable(CAP_SYS_ADMIN)) {
-                if (new_serial.close_delay != info->close_delay ||
+                if (new_serial.close_delay != info->port.close_delay ||
                                 new_serial.baud_base != info->baud ||
                                 (new_serial.flags & ASYNC_FLAGS &
                                         ~ASYNC_USR_MASK) !=
-                                (info->flags & ASYNC_FLAGS & ~ASYNC_USR_MASK))
+                                (info->port.flags & ASYNC_FLAGS & ~ASYNC_USR_MASK))
                         return -EPERM;
-                info->flags = (info->flags & ~ASYNC_USR_MASK) |
+                info->port.flags = (info->port.flags & ~ASYNC_USR_MASK) |
                                 (new_serial.flags & ASYNC_USR_MASK);
                 info->baud = new_serial.baud_base;
                 info->custom_divisor = new_serial.custom_divisor;
@@ -3422,13 +3422,13 @@ set_serial_info(struct cyclades_port *info,
 
         info->baud = new_serial.baud_base;
         info->custom_divisor = new_serial.custom_divisor;
-        info->flags = (info->flags & ~ASYNC_FLAGS) |
+        info->port.flags = (info->port.flags & ~ASYNC_FLAGS) |
                         (new_serial.flags & ASYNC_FLAGS);
-        info->close_delay = new_serial.close_delay * HZ / 100;
-        info->closing_wait = new_serial.closing_wait * HZ / 100;
+        info->port.close_delay = new_serial.close_delay * HZ / 100;
+        info->port.closing_wait = new_serial.closing_wait * HZ / 100;
 
 check_and_exit:
-        if (info->flags & ASYNC_INITIALIZED) {
+        if (info->port.flags & ASYNC_INITIALIZED) {
                 set_line_char(info);
                 return 0;
         } else {
@@ -3971,11 +3971,11 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                 break;
 #endif                          /* CONFIG_CYZ_INTR */
         case CYSETWAIT:
-                info->closing_wait = (unsigned short)arg * HZ / 100;
+                info->port.closing_wait = (unsigned short)arg * HZ / 100;
                 ret_val = 0;
                 break;
         case CYGETWAIT:
-                ret_val = info->closing_wait / (HZ / 100);
+                ret_val = info->port.closing_wait / (HZ / 100);
                 break;
         case TIOCGSERIAL:
                 ret_val = get_serial_info(info, argp);
@@ -4097,7 +4097,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
          */
         if (!(old_termios->c_cflag & CLOCAL) &&
             (tty->termios->c_cflag & CLOCAL))
-                wake_up_interruptible(&info->open_wait);
+                wake_up_interruptible(&info->port.open_wait);
 #endif
 }                               /* cy_set_termios */
 
@@ -4326,14 +4326,14 @@ static void cy_hangup(struct tty_struct *tty)
 
         cy_flush_buffer(tty);
         shutdown(info);
-        info->count = 0;
+        info->port.count = 0;
 #ifdef CY_DEBUG_COUNT
         printk(KERN_DEBUG "cyc:cy_hangup (%d): setting count to 0\n",
                 current->pid);
 #endif
-        info->tty = NULL;
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        wake_up_interruptible(&info->open_wait);
+        info->port.tty = NULL;
+        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        wake_up_interruptible(&info->port.open_wait);
 }                               /* cy_hangup */
 
 /*
@@ -4376,15 +4376,14 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
         for (port = cinfo->first_line; port < cinfo->first_line + nports;
                         port++) {
                 info = &cinfo->ports[port - cinfo->first_line];
+                tty_port_init(&info->port);
                 info->magic = CYCLADES_MAGIC;
                 info->card = cinfo;
                 info->line = port;
-                info->flags = STD_COM_FLAGS;
-                info->closing_wait = CLOSING_WAIT_DELAY;
-                info->close_delay = 5 * HZ / 10;
 
-                init_waitqueue_head(&info->open_wait);
-                init_waitqueue_head(&info->close_wait);
+                info->port.closing_wait = CLOSING_WAIT_DELAY;
+                info->port.close_delay = 5 * HZ / 10;
+                info->port.flags = STD_COM_FLAGS;
                 init_completion(&info->shutdown_wait);
                 init_waitqueue_head(&info->delta_msr_wait);
 
@@ -5237,7 +5236,7 @@ cyclades_get_proc_info(char *buf, char **start, off_t offset, int length,
                 for (j = 0; j < cy_card[i].nports; j++) {
                         info = &cy_card[i].ports[j];
 
-                        if (info->count)
+                        if (info->port.count)
                                 size = sprintf(buf + len, "%3d %8lu %10lu %8lu "
                                         "%10lu %8lu %9lu %6ld\n", info->line,
                                         (cur_jifs - info->idle_stats.in_use) /
@@ -5246,7 +5245,8 @@ cyclades_get_proc_info(char *buf, char **start, off_t offset, int length,
                                         HZ, info->idle_stats.recv_bytes,
                                         (cur_jifs - info->idle_stats.recv_idle)/
                                         HZ, info->idle_stats.overruns,
-                                        (long)info->tty->ldisc.num);
+                                        /* FIXME: double check locking */
+                                        (long)info->port.tty->ldisc.ops->num);
                         else
                                 size = sprintf(buf + len, "%3d %8lu %10lu %8lu "
                                         "%10lu %8lu %9lu %6ld\n",
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 60a4df7dac12..ac9995f6578b 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -432,7 +432,7 @@ static void pc_close(struct tty_struct *tty, struct file *filp)
                         spin_unlock_irqrestore(&epca_lock, flags);
                         return;
                 }
-                if (ch->count-- > 1)  {
+                if (ch->port.count-- > 1)  {
                         /* Begin channel is open more than once */
                         /*
                          * Return without doing anything. Someone might still
@@ -442,19 +442,19 @@ static void pc_close(struct tty_struct *tty, struct file *filp)
                         return;
                 }
                 /* Port open only once go ahead with shutdown & reset */
-                BUG_ON(ch->count < 0);
+                BUG_ON(ch->port.count < 0);
 
                 /*
                  * Let the rest of the driver know the channel is being closed.
                  * This becomes important if an open is attempted before close
                  * is finished.
                  */
-                ch->asyncflags |= ASYNC_CLOSING;
+                ch->port.flags |= ASYNC_CLOSING;
                 tty->closing = 1;
 
                 spin_unlock_irqrestore(&epca_lock, flags);
 
-                if (ch->asyncflags & ASYNC_INITIALIZED)  {
+                if (ch->port.flags & ASYNC_INITIALIZED)  {
                         /* Setup an event to indicate when the
                            transmit buffer empties */
                         setup_empty_event(tty, ch);
@@ -469,17 +469,17 @@ static void pc_close(struct tty_struct *tty, struct file *filp)
                 spin_lock_irqsave(&epca_lock, flags);
                 tty->closing = 0;
                 ch->event = 0;
-                ch->tty = NULL;
+                ch->port.tty = NULL;
                 spin_unlock_irqrestore(&epca_lock, flags);
 
-                if (ch->blocked_open) {
+                if (ch->port.blocked_open) {
                         if (ch->close_delay)
                                 msleep_interruptible(jiffies_to_msecs(ch->close_delay));
-                        wake_up_interruptible(&ch->open_wait);
+                        wake_up_interruptible(&ch->port.open_wait);
                 }
-                ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED |
+                ch->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED |
                                         ASYNC_CLOSING);
-                wake_up_interruptible(&ch->close_wait);
+                wake_up_interruptible(&ch->port.close_wait);
         }
 }
 
@@ -489,7 +489,7 @@ static void shutdown(struct channel *ch)
         struct tty_struct *tty;
         struct board_chan __iomem *bc;
 
-        if (!(ch->asyncflags & ASYNC_INITIALIZED))
+        if (!(ch->port.flags & ASYNC_INITIALIZED))
                 return;
 
         spin_lock_irqsave(&epca_lock, flags);
@@ -504,7 +504,7 @@ static void shutdown(struct channel *ch)
          */
         if (bc)
                 writeb(0, &bc->idata);
-        tty = ch->tty;
+        tty = ch->port.tty;
 
         /* If we're a modem control device and HUPCL is on, drop RTS & DTR. */
         if (tty->termios->c_cflag & HUPCL)  {
@@ -518,7 +518,7 @@ static void shutdown(struct channel *ch)
          * will have to reinitialized. Set a flag to indicate this.
          */
         /* Prevent future Digi programmed interrupts from coming active */
-        ch->asyncflags &= ~ASYNC_INITIALIZED;
+        ch->port.flags &= ~ASYNC_INITIALIZED;
         spin_unlock_irqrestore(&epca_lock, flags);
 }
 
@@ -538,12 +538,12 @@ static void pc_hangup(struct tty_struct *tty)
                 shutdown(ch);
 
                 spin_lock_irqsave(&epca_lock, flags);
-                ch->tty   = NULL;
+                ch->port.tty   = NULL;
                 ch->event = 0;
-                ch->count = 0;
-                ch->asyncflags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED);
+                ch->port.count = 0;
+                ch->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_INITIALIZED);
                 spin_unlock_irqrestore(&epca_lock, flags);
-                wake_up_interruptible(&ch->open_wait);
+                wake_up_interruptible(&ch->port.open_wait);
         }
 }
 
@@ -795,7 +795,7 @@ static int block_til_ready(struct tty_struct *tty,
         unsigned long flags;
 
         if (tty_hung_up_p(filp)) {
-                if (ch->asyncflags & ASYNC_HUP_NOTIFY)
+                if (ch->port.flags & ASYNC_HUP_NOTIFY)
                         retval = -EAGAIN;
                 else
                         retval = -ERESTARTSYS;
@@ -806,10 +806,10 @@ static int block_til_ready(struct tty_struct *tty,
          * If the device is in the middle of being closed, then block until
          * it's done, and then try again.
          */
-        if (ch->asyncflags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&ch->close_wait);
+        if (ch->port.flags & ASYNC_CLOSING) {
+                interruptible_sleep_on(&ch->port.close_wait);
 
-                if (ch->asyncflags & ASYNC_HUP_NOTIFY)
+                if (ch->port.flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
                 else
                         return -ERESTARTSYS;
@@ -820,7 +820,7 @@ static int block_til_ready(struct tty_struct *tty,
                  * If non-blocking mode is set, then make the check up front
                  * and then exit.
                  */
-                ch->asyncflags |= ASYNC_NORMAL_ACTIVE;
+                ch->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
         if (tty->termios->c_cflag & CLOCAL)
@@ -828,24 +828,24 @@ static int block_til_ready(struct tty_struct *tty,
         /* Block waiting for the carrier detect and the line to become free */
 
         retval = 0;
-        add_wait_queue(&ch->open_wait, &wait);
+        add_wait_queue(&ch->port.open_wait, &wait);
 
         spin_lock_irqsave(&epca_lock, flags);
         /* We dec count so that pc_close will know when to free things */
         if (!tty_hung_up_p(filp))
-                ch->count--;
-        ch->blocked_open++;
+                ch->port.count--;
+        ch->port.blocked_open++;
         while (1) {
                 set_current_state(TASK_INTERRUPTIBLE);
                 if (tty_hung_up_p(filp) ||
-                                !(ch->asyncflags & ASYNC_INITIALIZED)) {
-                        if (ch->asyncflags & ASYNC_HUP_NOTIFY)
+                                !(ch->port.flags & ASYNC_INITIALIZED)) {
+                        if (ch->port.flags & ASYNC_HUP_NOTIFY)
                                 retval = -EAGAIN;
                         else
                                 retval = -ERESTARTSYS;
                         break;
                 }
-                if (!(ch->asyncflags & ASYNC_CLOSING) &&
+                if (!(ch->port.flags & ASYNC_CLOSING) &&
                           (do_clocal || (ch->imodem & ch->dcd)))
                         break;
                 if (signal_pending(current)) {
@@ -864,17 +864,17 @@ static int block_til_ready(struct tty_struct *tty,
         }
 
         __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&ch->open_wait, &wait);
+        remove_wait_queue(&ch->port.open_wait, &wait);
         if (!tty_hung_up_p(filp))
-                ch->count++;
-        ch->blocked_open--;
+                ch->port.count++;
+        ch->port.blocked_open--;
 
         spin_unlock_irqrestore(&epca_lock, flags);
 
         if (retval)
                 return retval;
 
-        ch->asyncflags |= ASYNC_NORMAL_ACTIVE;
+        ch->port.flags |= ASYNC_NORMAL_ACTIVE;
         return 0;
 }
 
@@ -933,7 +933,7 @@ static int pc_open(struct tty_struct *tty, struct file *filp)
          * necessary because we do not wish to flush and shutdown the channel
          * until the last app holding the channel open, closes it.
          */
-        ch->count++;
+        ch->port.count++;
         /*
          * Set a kernel structures pointer to our local channel structure. This
          * way we can get to it when passed only a tty struct.
@@ -957,14 +957,14 @@ static int pc_open(struct tty_struct *tty, struct file *filp)
         writew(head, &bc->rout);
 
         /* Set the channels associated tty structure */
-        ch->tty = tty;
+        ch->port.tty = tty;
 
         /*
          * The below routine generally sets up parity, baud, flow control
          * issues, etc.... It effect both control flags and input flags.
          */
         epcaparam(tty, ch);
-        ch->asyncflags |= ASYNC_INITIALIZED;
+        ch->port.flags |= ASYNC_INITIALIZED;
         memoff(ch);
         spin_unlock_irqrestore(&epca_lock, flags);
 
@@ -976,7 +976,7 @@ static int pc_open(struct tty_struct *tty, struct file *filp)
          * waiting for the line...
          */
         spin_lock_irqsave(&epca_lock, flags);
-        ch->tty = tty;
+        ch->port.tty = tty;
         globalwinon(ch);
         /* Enable Digi Data events */
         writeb(1, &bc->idata);
@@ -1017,8 +1017,8 @@ static void __exit epca_module_exit(void)
                 }
                 ch = card_ptr[crd];
                 for (count = 0; count < bd->numports; count++, ch++) {
-                        if (ch && ch->tty)
-                                tty_hangup(ch->tty);
+                        if (ch && ch->port.tty)
+                                tty_hangup(ch->port.tty);
                 }
         }
         pci_unregister_driver(&epca_driver);
@@ -1427,7 +1427,7 @@ static void post_fep_init(unsigned int crd)
                 ch->boardnum   = crd;
                 ch->channelnum = i;
                 ch->magic      = EPCA_MAGIC;
-                ch->tty        = NULL;
+                ch->port.tty        = NULL;
 
                 if (shrinkmem) {
                         fepcmd(ch, SETBUFFER, 32, 0, 0, 0);
@@ -1510,10 +1510,10 @@ static void post_fep_init(unsigned int crd)
                 ch->fepstopca = 0;
 
                 ch->close_delay = 50;
-                ch->count = 0;
-                ch->blocked_open = 0;
-                init_waitqueue_head(&ch->open_wait);
-                init_waitqueue_head(&ch->close_wait);
+                ch->port.count = 0;
+                ch->port.blocked_open = 0;
+                init_waitqueue_head(&ch->port.open_wait);
+                init_waitqueue_head(&ch->port.close_wait);
 
                 spin_unlock_irqrestore(&epca_lock, flags);
         }
@@ -1633,15 +1633,15 @@ static void doevent(int crd)
                 if (event & MODEMCHG_IND) {
                         /* A modem signal change has been indicated */
                         ch->imodem = mstat;
-                        if (ch->asyncflags & ASYNC_CHECK_CD) {
+                        if (ch->port.flags & ASYNC_CHECK_CD) {
                                 /* We are now receiving dcd */
                                 if (mstat & ch->dcd)
-                                        wake_up_interruptible(&ch->open_wait);
+                                        wake_up_interruptible(&ch->port.open_wait);
                                 else    /* No dcd; hangup */
                                         pc_sched_event(ch, EPCA_EVENT_HANGUP);
                         }
                 }
-                tty = ch->tty;
+                tty = ch->port.tty;
                 if (tty) {
                         if (event & BREAK_IND) {
                                 /* A break has been indicated */
@@ -1880,9 +1880,9 @@ static void epcaparam(struct tty_struct *tty, struct channel *ch)
                  * that the driver will wait on carrier detect.
                  */
                 if (ts->c_cflag & CLOCAL)
-                        ch->asyncflags &= ~ASYNC_CHECK_CD;
+                        ch->port.flags &= ~ASYNC_CHECK_CD;
                 else
-                        ch->asyncflags |= ASYNC_CHECK_CD;
+                        ch->port.flags |= ASYNC_CHECK_CD;
                 mval = ch->m_dtr | ch->m_rts;
         } /* End CBAUD not detected */
         iflag = termios2digi_i(ch, ts->c_iflag);
@@ -1972,7 +1972,7 @@ static void receive_data(struct channel *ch)
         globalwinon(ch);
         if (ch->statusflags & RXSTOPPED)
                 return;
-        tty = ch->tty;
+        tty = ch->port.tty;
         if (tty)
                 ts = tty->termios;
         bc = ch->brdchan;
@@ -2032,7 +2032,7 @@ static void receive_data(struct channel *ch)
         globalwinon(ch);
         writew(tail, &bc->rout);
         /* Must be called with global data */
-        tty_schedule_flip(ch->tty);
+        tty_schedule_flip(ch->port.tty);
 }
 
 static int info_ioctl(struct tty_struct *tty, struct file *file,
@@ -2262,8 +2262,8 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file,
                         tty_wait_until_sent(tty, 0);
                 } else {
                         /* ldisc lock already held in ioctl */
-                        if (tty->ldisc.flush_buffer)
-                                tty->ldisc.flush_buffer(tty);
+                        if (tty->ldisc.ops->flush_buffer)
+                                tty->ldisc.ops->flush_buffer(tty);
                 }
                 unlock_kernel();
                 /* Fall Thru */
@@ -2376,7 +2376,7 @@ static void pc_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
                 if (!(old_termios->c_cflag & CLOCAL) &&
                          (tty->termios->c_cflag & CLOCAL))
-                        wake_up_interruptible(&ch->open_wait);
+                        wake_up_interruptible(&ch->port.open_wait);
 
         } /* End if channel valid */
 }
@@ -2386,13 +2386,13 @@ static void do_softint(struct work_struct *work)
         struct channel *ch = container_of(work, struct channel, tqueue);
         /* Called in response to a modem change event */
         if (ch && ch->magic == EPCA_MAGIC) {
-                struct tty_struct *tty = ch->tty;
+                struct tty_struct *tty = ch->port.tty;
 
                 if (tty && tty->driver_data) {
                         if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) {
                                 tty_hangup(tty);
-                                wake_up_interruptible(&ch->open_wait);
-                                ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE;
+                                wake_up_interruptible(&ch->port.open_wait);
+                                ch->port.flags &= ~ASYNC_NORMAL_ACTIVE;
                         }
                 }
         }
diff --git a/drivers/char/epca.h b/drivers/char/epca.h
index 3c77c02b5d65..d414bf2dbf7c 100644
--- a/drivers/char/epca.h
+++ b/drivers/char/epca.h
@@ -84,6 +84,7 @@ static char *board_desc[] =
 struct channel 
 {
         long   magic;
+        struct tty_port port;
         unsigned char boardnum;
         unsigned char channelnum;
         unsigned char omodem;         /* FEP output modem status     */
@@ -117,10 +118,7 @@ struct channel
         unsigned short rxbufhead;
         unsigned short rxbufsize;
         int    close_delay;
-        int    count;
-        int    blocked_open;
         unsigned long  event;
-        int    asyncflags;
         uint   dev;
         unsigned long  statusflags;
         unsigned long  c_iflag;
@@ -132,9 +130,6 @@ struct channel
         struct board_info           *board;
         struct board_chan           __iomem *brdchan;
         struct digi_struct          digiext;
-        struct tty_struct           *tty;
-        wait_queue_head_t           open_wait;
-        wait_queue_head_t           close_wait;
         struct work_struct          tqueue;
         struct global_data          __iomem *mailbox;
 };
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 84840ba13ff0..2eaf09f93e3d 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -128,9 +128,9 @@ static struct tty_driver *esp_driver;
 
 #if defined(MODULE) && defined(SERIAL_DEBUG_MCOUNT)
 #define DBG_CNT(s) printk(KERN_DEBUG "(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \
-                                tty->name, info->flags, \
+                                tty->name, info->port.flags, \
                                 serial_driver.refcount, \
-                                info->count, tty->count, s)
+                                info->port.count, tty->count, s)
 #else
 #define DBG_CNT(s)
 #endif
@@ -172,13 +172,13 @@ static inline int serial_paranoia_check(struct esp_struct *info,
 
 static inline unsigned int serial_in(struct esp_struct *info, int offset)
 {
-        return inb(info->port + offset);
+        return inb(info->io_port + offset);
 }
 
 static inline void serial_out(struct esp_struct *info, int offset,
                               unsigned char value)
 {
-        outb(value, info->port+offset);
+        outb(value, info->io_port+offset);
 }
 
 /*
@@ -273,7 +273,7 @@ static inline void release_pio_buffer(struct esp_pio_buffer *buf)
 
 static inline void receive_chars_pio(struct esp_struct *info, int num_bytes)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         int i;
         struct esp_pio_buffer *pio_buf;
         struct esp_pio_buffer *err_buf;
@@ -295,7 +295,7 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes)
 
         for (i = 0; i < num_bytes - 1; i += 2) {
                 *((unsigned short *)(pio_buf->data + i)) =
-                        inw(info->port + UART_ESI_RX);
+                        inw(info->io_port + UART_ESI_RX);
                 err_buf->data[i] = serial_in(info, UART_ESI_RWS);
                 err_buf->data[i + 1] = (err_buf->data[i] >> 3) & status_mask;
                 err_buf->data[i] &= status_mask;
@@ -308,7 +308,7 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes)
         }
 
         /* make sure everything is still ok since interrupts were enabled */
-        tty = info->tty;
+        tty = info->port.tty;
 
         if (!tty) {
                 release_pio_buffer(pio_buf);
@@ -325,7 +325,7 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes)
 
                         if (err_buf->data[i] & 0x04) {
                                 flag = TTY_BREAK;
-                                if (info->flags & ASYNC_SAK)
+                                if (info->port.flags & ASYNC_SAK)
                                         do_SAK(tty);
                         } else if (err_buf->data[i] & 0x02)
                                 flag = TTY_FRAME;
@@ -370,7 +370,7 @@ static void receive_chars_dma(struct esp_struct *info, int num_bytes)
 static inline void receive_chars_dma_done(struct esp_struct *info,
                                             int status)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         int num_bytes;
         unsigned long flags;
 
@@ -396,7 +396,7 @@ static inline void receive_chars_dma_done(struct esp_struct *info,
                         if (status & 0x10) {
                                 statflag = TTY_BREAK;
                                 (info->icount.brk)++;
-                                if (info->flags & ASYNC_SAK)
+                                if (info->port.flags & ASYNC_SAK)
                                         do_SAK(tty);
                         } else if (status & 0x08) {
                                 statflag = TTY_FRAME;
@@ -451,7 +451,7 @@ static inline void transmit_chars_pio(struct esp_struct *info,
 
                 for (i = 0; i < space_avail - 1; i += 2) {
                         outw(*((unsigned short *)(pio_buf->data + i)),
-                             info->port + UART_ESI_TX);
+                             info->io_port + UART_ESI_TX);
                 }
 
                 if (space_avail & 0x0001)
@@ -470,8 +470,8 @@ static inline void transmit_chars_pio(struct esp_struct *info,
         }
 
         if (info->xmit_cnt < WAKEUP_CHARS) {
-                if (info->tty)
-                        tty_wakeup(info->tty);
+                if (info->port.tty)
+                        tty_wakeup(info->port.tty);
 
 #ifdef SERIAL_DEBUG_INTR
                 printk("THRE...");
@@ -507,8 +507,8 @@ static inline void transmit_chars_dma(struct esp_struct *info, int num_bytes)
         info->xmit_tail = (info->xmit_tail + dma_bytes) & (ESP_XMIT_SIZE - 1);
 
         if (info->xmit_cnt < WAKEUP_CHARS) {
-                if (info->tty)
-                        tty_wakeup(info->tty);
+                if (info->port.tty)
+                        tty_wakeup(info->port.tty);
 
 #ifdef SERIAL_DEBUG_INTR
                 printk("THRE...");
@@ -575,18 +575,18 @@ static void check_modem_status(struct esp_struct *info)
                 wake_up_interruptible(&info->delta_msr_wait);
         }
 
-        if ((info->flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
+        if ((info->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
 #if (defined(SERIAL_DEBUG_OPEN) || defined(SERIAL_DEBUG_INTR))
                 printk("ttys%d CD now %s...", info->line,
                        (status & UART_MSR_DCD) ? "on" : "off");
 #endif
                 if (status & UART_MSR_DCD)
-                        wake_up_interruptible(&info->open_wait);
+                        wake_up_interruptible(&info->port.open_wait);
                 else {
 #ifdef SERIAL_DEBUG_OPEN
                         printk("scheduling hangup...");
 #endif
-                        tty_hangup(info->tty);
+                        tty_hangup(info->port.tty);
                 }
         }
 }
@@ -609,7 +609,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
 
         spin_lock(&info->lock);
 
-        if (!info->tty) {
+        if (!info->port.tty) {
                 spin_unlock(&info->lock);
                 return IRQ_NONE;
         }
@@ -647,7 +647,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
                 num_bytes = serial_in(info, UART_ESI_STAT1) << 8;
                 num_bytes |= serial_in(info, UART_ESI_STAT2);
 
-                num_bytes = tty_buffer_request_room(info->tty, num_bytes);
+                num_bytes = tty_buffer_request_room(info->port.tty, num_bytes);
 
                 if (num_bytes) {
                         if (dma_bytes ||
@@ -661,7 +661,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
 
         if (!(info->stat_flags & (ESP_STAT_DMA_RX | ESP_STAT_DMA_TX)) &&
             (scratch & 0x02) && (info->IER & UART_IER_THRI)) {
-                if ((info->xmit_cnt <= 0) || info->tty->stopped) {
+                if ((info->xmit_cnt <= 0) || info->port.tty->stopped) {
                         info->IER &= ~UART_IER_THRI;
                         serial_out(info, UART_ESI_CMD1, ESI_SET_SRV_MASK);
                         serial_out(info, UART_ESI_CMD2, info->IER);
@@ -782,7 +782,7 @@ static int startup(struct esp_struct *info)
 
         spin_lock_irqsave(&info->lock, flags);
 
-        if (info->flags & ASYNC_INITIALIZED)
+        if (info->port.flags & ASYNC_INITIALIZED)
                 goto out;
 
         if (!info->xmit_buf) {
@@ -806,7 +806,7 @@ static int startup(struct esp_struct *info)
         num_chars |= serial_in(info, UART_ESI_STAT2);
 
         while (num_chars > 1) {
-                inw(info->port + UART_ESI_RX);
+                inw(info->io_port + UART_ESI_RX);
                 num_chars -= 2;
         }
 
@@ -834,9 +834,9 @@ static int startup(struct esp_struct *info)
 
         if (retval) {
                 if (capable(CAP_SYS_ADMIN)) {
-                        if (info->tty)
+                        if (info->port.tty)
                                 set_bit(TTY_IO_ERROR,
-                                        &info->tty->flags);
+                                        &info->port.tty->flags);
                         retval = 0;
                 }
                 goto out_unlocked;
@@ -874,30 +874,30 @@ static int startup(struct esp_struct *info)
         serial_out(info, UART_ESI_CMD1, ESI_SET_SRV_MASK);
         serial_out(info, UART_ESI_CMD2, info->IER);
 
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
         spin_unlock_irqrestore(&info->lock, flags);
 
         /*
          * Set up the tty->alt_speed kludge
          */
-        if (info->tty) {
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        info->tty->alt_speed = 57600;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        info->tty->alt_speed = 115200;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                        info->tty->alt_speed = 230400;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                        info->tty->alt_speed = 460800;
+        if (info->port.tty) {
+                if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                        info->port.tty->alt_speed = 57600;
+                if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                        info->port.tty->alt_speed = 115200;
+                if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                        info->port.tty->alt_speed = 230400;
+                if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                        info->port.tty->alt_speed = 460800;
         }
 
         /*
          * set the speed of the serial port
          */
         change_speed(info);
-        info->flags |= ASYNC_INITIALIZED;
+        info->port.flags |= ASYNC_INITIALIZED;
         return 0;
 
 out:
@@ -914,7 +914,7 @@ static void shutdown(struct esp_struct *info)
 {
         unsigned long   flags, f;
 
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 return;
 
 #ifdef SERIAL_DEBUG_OPEN
@@ -951,7 +951,7 @@ static void shutdown(struct esp_struct *info)
 
                 while (current_port) {
                         if ((current_port != info) &&
-                            (current_port->flags & ASYNC_INITIALIZED))
+                            (current_port->port.flags & ASYNC_INITIALIZED))
                                 break;
 
                         current_port = current_port->next_port;
@@ -974,7 +974,7 @@ static void shutdown(struct esp_struct *info)
         serial_out(info, UART_ESI_CMD1, ESI_SET_SRV_MASK);
         serial_out(info, UART_ESI_CMD2, 0x00);
 
-        if (!info->tty || (info->tty->termios->c_cflag & HUPCL))
+        if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL))
                 info->MCR &= ~(UART_MCR_DTR|UART_MCR_RTS);
 
         info->MCR &= ~UART_MCR_OUT2;
@@ -982,10 +982,10 @@ static void shutdown(struct esp_struct *info)
         serial_out(info, UART_ESI_CMD2, UART_MCR);
         serial_out(info, UART_ESI_CMD2, info->MCR);
 
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-        info->flags &= ~ASYNC_INITIALIZED;
+        info->port.flags &= ~ASYNC_INITIALIZED;
         spin_unlock_irqrestore(&info->lock, flags);
 }
 
@@ -1002,10 +1002,10 @@ static void change_speed(struct esp_struct *info)
         unsigned char flow1 = 0, flow2 = 0;
         unsigned long flags;
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
-        cflag = info->tty->termios->c_cflag;
-        port = info->port;
+        cflag = info->port.tty->termios->c_cflag;
+        port = info->io_port;
 
         /* byte size and parity */
         switch (cflag & CSIZE) {
@@ -1029,9 +1029,9 @@ static void change_speed(struct esp_struct *info)
         if (cflag & CMSPAR)
                 cval |= UART_LCR_SPAR;
 #endif
-        baud = tty_get_baud_rate(info->tty);
+        baud = tty_get_baud_rate(info->port.tty);
         if (baud == 38400 &&
-                ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST))
+                ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST))
                 quot = info->custom_divisor;
         else {
                 if (baud == 134) /* Special case since 134 is really 134.5 */
@@ -1046,49 +1046,49 @@ static void change_speed(struct esp_struct *info)
         if (baud) {
                 /* Actual rate */
                 baud = BASE_BAUD/quot;
-                tty_encode_baud_rate(info->tty, baud, baud);
+                tty_encode_baud_rate(info->port.tty, baud, baud);
         }
         info->timeout = ((1024 * HZ * bits * quot) / BASE_BAUD) + (HZ / 50);
 
         /* CTS flow control flag and modem status interrupts */
         /* info->IER &= ~UART_IER_MSI; */
         if (cflag & CRTSCTS) {
-                info->flags |= ASYNC_CTS_FLOW;
+                info->port.flags |= ASYNC_CTS_FLOW;
                 /* info->IER |= UART_IER_MSI; */
                 flow1 = 0x04;
                 flow2 = 0x10;
         } else
-                info->flags &= ~ASYNC_CTS_FLOW;
+                info->port.flags &= ~ASYNC_CTS_FLOW;
         if (cflag & CLOCAL)
-                info->flags &= ~ASYNC_CHECK_CD;
+                info->port.flags &= ~ASYNC_CHECK_CD;
         else
-                info->flags |= ASYNC_CHECK_CD;
+                info->port.flags |= ASYNC_CHECK_CD;
 
         /*
          * Set up parity check flag
          */
         info->read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
-        if (I_INPCK(info->tty))
+        if (I_INPCK(info->port.tty))
                 info->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
+        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
                 info->read_status_mask |= UART_LSR_BI;
 
         info->ignore_status_mask = 0;
 #if 0
         /* This should be safe, but for some broken bits of hardware... */
-        if (I_IGNPAR(info->tty)) {
+        if (I_IGNPAR(info->port.tty)) {
                 info->ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
                 info->read_status_mask |= UART_LSR_PE | UART_LSR_FE;
         }
 #endif
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(info->port.tty)) {
                 info->ignore_status_mask |= UART_LSR_BI;
                 info->read_status_mask |= UART_LSR_BI;
                 /*
                  * If we're ignore parity and break indicators, ignore
                  * overruns too.  (For real raw support).
                  */
-                if (I_IGNPAR(info->tty)) {
+                if (I_IGNPAR(info->port.tty)) {
                         info->ignore_status_mask |= UART_LSR_OE | \
                                 UART_LSR_PE | UART_LSR_FE;
                         info->read_status_mask |= UART_LSR_OE | \
@@ -1096,7 +1096,7 @@ static void change_speed(struct esp_struct *info)
                 }
         }
 
-        if (I_IXOFF(info->tty))
+        if (I_IXOFF(info->port.tty))
                 flow1 |= 0x81;
 
         spin_lock_irqsave(&info->lock, flags);
@@ -1116,10 +1116,10 @@ static void change_speed(struct esp_struct *info)
         serial_out(info, UART_ESI_CMD2, flow2);
 
         /* set flow control characters (XON/XOFF only) */
-        if (I_IXOFF(info->tty)) {
+        if (I_IXOFF(info->port.tty)) {
                 serial_out(info, UART_ESI_CMD1, ESI_SET_FLOW_CHARS);
-                serial_out(info, UART_ESI_CMD2, START_CHAR(info->tty));
-                serial_out(info, UART_ESI_CMD2, STOP_CHAR(info->tty));
+                serial_out(info, UART_ESI_CMD2, START_CHAR(info->port.tty));
+                serial_out(info, UART_ESI_CMD2, STOP_CHAR(info->port.tty));
                 serial_out(info, UART_ESI_CMD2, 0x10);
                 serial_out(info, UART_ESI_CMD2, 0x21);
                 switch (cflag & CSIZE) {
@@ -1355,9 +1355,9 @@ static int get_serial_info(struct esp_struct *info,
         memset(&tmp, 0, sizeof(tmp));
         tmp.type = PORT_16550A;
         tmp.line = info->line;
-        tmp.port = info->port;
+        tmp.port = info->io_port;
         tmp.irq = info->irq;
-        tmp.flags = info->flags;
+        tmp.flags = info->port.flags;
         tmp.xmit_fifo_size = 1024;
         tmp.baud_base = BASE_BAUD;
         tmp.close_delay = info->close_delay;
@@ -1407,7 +1407,7 @@ static int set_serial_info(struct esp_struct *info,
 
         if ((new_serial.type != PORT_16550A) ||
             (new_serial.hub6) ||
-            (info->port != new_serial.port) ||
+            (info->io_port != new_serial.port) ||
             (new_serial.baud_base != BASE_BAUD) ||
             (new_serial.irq > 15) ||
             (new_serial.irq < 2) ||
@@ -1425,9 +1425,9 @@ static int set_serial_info(struct esp_struct *info,
                 if (change_irq ||
                     (new_serial.close_delay != info->close_delay) ||
                     ((new_serial.flags & ~ASYNC_USR_MASK) !=
-                     (info->flags & ~ASYNC_USR_MASK)))
+                     (info->port.flags & ~ASYNC_USR_MASK)))
                         return -EPERM;
-                info->flags = ((info->flags & ~ASYNC_USR_MASK) |
+                info->port.flags = ((info->port.flags & ~ASYNC_USR_MASK) |
                                (new_serial.flags & ASYNC_USR_MASK));
                 info->custom_divisor = new_serial.custom_divisor;
         } else {
@@ -1441,9 +1441,9 @@ static int set_serial_info(struct esp_struct *info,
                                 if ((current_async->line >= info->line) &&
                                     (current_async->line < (info->line + 8))) {
                                         if (current_async == info) {
-                                                if (current_async->count > 1)
+                                                if (current_async->port.count > 1)
                                                         return -EBUSY;
-                                        } else if (current_async->count)
+                                        } else if (current_async->port.count)
                                                 return -EBUSY;
                                 }
 
@@ -1456,7 +1456,7 @@ static int set_serial_info(struct esp_struct *info,
                  * At this point, we start making changes.....
                  */
 
-                info->flags = ((info->flags & ~ASYNC_FLAGS) |
+                info->port.flags = ((info->port.flags & ~ASYNC_FLAGS) |
                                (new_serial.flags & ASYNC_FLAGS));
                 info->custom_divisor = new_serial.custom_divisor;
                 info->close_delay = new_serial.close_delay * HZ/100;
@@ -1487,18 +1487,18 @@ static int set_serial_info(struct esp_struct *info,
                 }
         }
 
-        if (info->flags & ASYNC_INITIALIZED) {
-                if (((old_info.flags & ASYNC_SPD_MASK) !=
-                     (info->flags & ASYNC_SPD_MASK)) ||
+        if (info->port.flags & ASYNC_INITIALIZED) {
+                if (((old_info.port.flags & ASYNC_SPD_MASK) !=
+                     (info->port.flags & ASYNC_SPD_MASK)) ||
                     (old_info.custom_divisor != info->custom_divisor)) {
-                        if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                                info->tty->alt_speed = 57600;
-                        if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                                info->tty->alt_speed = 115200;
-                        if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                                info->tty->alt_speed = 230400;
-                        if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                                info->tty->alt_speed = 460800;
+                        if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                                info->port.tty->alt_speed = 57600;
+                        if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                                info->port.tty->alt_speed = 115200;
+                        if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                                info->port.tty->alt_speed = 230400;
+                        if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                                info->port.tty->alt_speed = 460800;
                         change_speed(info);
                 }
         } else
@@ -1554,9 +1554,9 @@ static int set_esp_config(struct esp_struct *info,
 
                         while (current_async) {
                                 if (current_async == info) {
-                                        if (current_async->count > 1)
+                                        if (current_async->port.count > 1)
                                                 return -EBUSY;
-                                } else if (current_async->count)
+                                } else if (current_async->port.count)
                                         return -EBUSY;
 
                                 current_async = current_async->next_port;
@@ -1578,7 +1578,7 @@ static int set_esp_config(struct esp_struct *info,
                         spin_unlock_irqrestore(&info->lock, flags);
                 } else {
                         /* DMA mode to PIO mode only */
-                        if (info->count > 1)
+                        if (info->port.count > 1)
                                 return -EBUSY;
 
                         shutdown(info);
@@ -1634,7 +1634,7 @@ static int set_esp_config(struct esp_struct *info,
                 spin_unlock_irqrestore(&info->lock, flags);
         }
 
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 retval = startup(info);
 
         return retval;
@@ -1917,9 +1917,9 @@ static void rs_close(struct tty_struct *tty, struct file *filp)
 
 #ifdef SERIAL_DEBUG_OPEN
         printk(KERN_DEBUG "rs_close ttys%d, count = %d\n",
-                                                info->line, info->count);
+                                                info->line, info->port.count);
 #endif
-        if (tty->count == 1 && info->count != 1) {
+        if (tty->count == 1 && info->port.count != 1) {
                 /*
                  * Uh, oh.  tty->count is 1, which means that the tty
                  * structure will be freed.  Info->count should always
@@ -1927,19 +1927,19 @@ static void rs_close(struct tty_struct *tty, struct file *filp)
                  * one, we've got real problems, since it means the
                  * serial port won't be shutdown.
                  */
-                printk(KERN_DEBUG "rs_close: bad serial port count; tty->count is 1, info->count is %d\n", info->count);
-                info->count = 1;
+                printk(KERN_DEBUG "rs_close: bad serial port count; tty->count is 1, info->port.count is %d\n", info->port.count);
+                info->port.count = 1;
         }
-        if (--info->count < 0) {
+        if (--info->port.count < 0) {
                 printk(KERN_ERR "rs_close: bad serial port count for ttys%d: %d\n",
-                       info->line, info->count);
-                info->count = 0;
+                       info->line, info->port.count);
+                info->port.count = 0;
         }
-        if (info->count) {
+        if (info->port.count) {
                 DBG_CNT("before DEC-2");
                 goto out;
         }
-        info->flags |= ASYNC_CLOSING;
+        info->port.flags |= ASYNC_CLOSING;
 
         spin_unlock_irqrestore(&info->lock, flags);
         /*
@@ -1958,7 +1958,7 @@ static void rs_close(struct tty_struct *tty, struct file *filp)
         /* info->IER &= ~UART_IER_RLSI; */
         info->IER &= ~UART_IER_RDI;
         info->read_status_mask &= ~UART_LSR_DR;
-        if (info->flags & ASYNC_INITIALIZED) {
+        if (info->port.flags & ASYNC_INITIALIZED) {
 
                 spin_lock_irqsave(&info->lock, flags);
                 serial_out(info, UART_ESI_CMD1, ESI_SET_SRV_MASK);
@@ -1981,15 +1981,15 @@ static void rs_close(struct tty_struct *tty, struct file *filp)
         rs_flush_buffer(tty);
         tty_ldisc_flush(tty);
         tty->closing = 0;
-        info->tty = NULL;
+        info->port.tty = NULL;
 
-        if (info->blocked_open) {
+        if (info->port.blocked_open) {
                 if (info->close_delay)
                         msleep_interruptible(jiffies_to_msecs(info->close_delay));
-                wake_up_interruptible(&info->open_wait);
+                wake_up_interruptible(&info->port.open_wait);
         }
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&info->close_wait);
+        info->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        wake_up_interruptible(&info->port.close_wait);
         return;
 
 out:
@@ -2047,10 +2047,10 @@ static void esp_hangup(struct tty_struct *tty)
 
         rs_flush_buffer(tty);
         shutdown(info);
-        info->count = 0;
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = NULL;
-        wake_up_interruptible(&info->open_wait);
+        info->port.count = 0;
+        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->port.tty = NULL;
+        wake_up_interruptible(&info->port.open_wait);
 }
 
 /*
@@ -2071,11 +2071,11 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
          * until it's done, and then try again.
          */
         if (tty_hung_up_p(filp) ||
-            (info->flags & ASYNC_CLOSING)) {
-                if (info->flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->close_wait);
+            (info->port.flags & ASYNC_CLOSING)) {
+                if (info->port.flags & ASYNC_CLOSING)
+                        interruptible_sleep_on(&info->port.close_wait);
 #ifdef SERIAL_DO_RESTART
-                if (info->flags & ASYNC_HUP_NOTIFY)
+                if (info->port.flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
                 else
                         return -ERESTARTSYS;
@@ -2090,7 +2090,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
          */
         if ((filp->f_flags & O_NONBLOCK) ||
             (tty->flags & (1 << TTY_IO_ERROR))) {
-                info->flags |= ASYNC_NORMAL_ACTIVE;
+                info->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
 
@@ -2100,20 +2100,20 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         /*
          * Block waiting for the carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
-         * this loop, info->count is dropped by one, so that
+         * this loop, info->port.count is dropped by one, so that
          * rs_close() knows when to free things.  We restore it upon
          * exit, either normal or abnormal.
          */
         retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
+        add_wait_queue(&info->port.open_wait, &wait);
 #ifdef SERIAL_DEBUG_OPEN
         printk(KERN_DEBUG "block_til_ready before block: ttys%d, count = %d\n",
-               info->line, info->count);
+               info->line, info->port.count);
 #endif
         spin_lock_irqsave(&info->lock, flags);
         if (!tty_hung_up_p(filp))
-                info->count--;
-        info->blocked_open++;
+                info->port.count--;
+        info->port.blocked_open++;
         while (1) {
                 if ((tty->termios->c_cflag & CBAUD)) {
                         unsigned int scratch;
@@ -2128,9 +2128,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 }
                 set_current_state(TASK_INTERRUPTIBLE);
                 if (tty_hung_up_p(filp) ||
-                    !(info->flags & ASYNC_INITIALIZED)) {
+                    !(info->port.flags & ASYNC_INITIALIZED)) {
 #ifdef SERIAL_DO_RESTART
-                        if (info->flags & ASYNC_HUP_NOTIFY)
+                        if (info->port.flags & ASYNC_HUP_NOTIFY)
                                 retval = -EAGAIN;
                         else
                                 retval = -ERESTARTSYS;
@@ -2144,7 +2144,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 if (serial_in(info, UART_ESI_STAT2) & UART_MSR_DCD)
                         do_clocal = 1;
 
-                if (!(info->flags & ASYNC_CLOSING) &&
+                if (!(info->port.flags & ASYNC_CLOSING) &&
                     (do_clocal))
                         break;
                 if (signal_pending(current)) {
@@ -2153,25 +2153,25 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 }
 #ifdef SERIAL_DEBUG_OPEN
                 printk(KERN_DEBUG "block_til_ready blocking: ttys%d, count = %d\n",
-                       info->line, info->count);
+                       info->line, info->port.count);
 #endif
                 spin_unlock_irqrestore(&info->lock, flags);
                 schedule();
                 spin_lock_irqsave(&info->lock, flags);
         }
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
+        remove_wait_queue(&info->port.open_wait, &wait);
         if (!tty_hung_up_p(filp))
-                info->count++;
-        info->blocked_open--;
+                info->port.count++;
+        info->port.blocked_open--;
         spin_unlock_irqrestore(&info->lock, flags);
 #ifdef SERIAL_DEBUG_OPEN
         printk(KERN_DEBUG "block_til_ready after blocking: ttys%d, count = %d\n",
-               info->line, info->count);
+               info->line, info->port.count);
 #endif
         if (retval)
                 return retval;
-        info->flags |= ASYNC_NORMAL_ACTIVE;
+        info->port.flags |= ASYNC_NORMAL_ACTIVE;
         return 0;
 }
 
@@ -2204,12 +2204,12 @@ static int esp_open(struct tty_struct *tty, struct file *filp)
         }
 
 #ifdef SERIAL_DEBUG_OPEN
-        printk(KERN_DEBUG "esp_open %s, count = %d\n", tty->name, info->count);
+        printk(KERN_DEBUG "esp_open %s, count = %d\n", tty->name, info->port.count);
 #endif
         spin_lock_irqsave(&info->lock, flags);
-        info->count++;
+        info->port.count++;
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
 
         spin_unlock_irqrestore(&info->lock, flags);
 
@@ -2263,7 +2263,7 @@ static int autoconfig(struct esp_struct *info)
         int port_detected = 0;
         unsigned long flags;
 
-        if (!request_region(info->port, REGION_SIZE, "esp serial"))
+        if (!request_region(info->io_port, REGION_SIZE, "esp serial"))
                 return -EIO;
 
         spin_lock_irqsave(&info->lock, flags);
@@ -2300,7 +2300,7 @@ static int autoconfig(struct esp_struct *info)
                 }
         }
         if (!port_detected)
-                release_region(info->port, REGION_SIZE);
+                release_region(info->io_port, REGION_SIZE);
 
         spin_unlock_irqrestore(&info->lock, flags);
         return (port_detected);
@@ -2414,7 +2414,7 @@ static int __init espserial_init(void)
         offset = 0;
 
         do {
-                info->port = esp[i] + offset;
+                info->io_port = esp[i] + offset;
                 info->irq = irq[i];
                 info->line = (i * 8) + (offset / 8);
 
@@ -2425,9 +2425,9 @@ static int __init espserial_init(void)
                 }
 
                 info->custom_divisor = (divisor[i] >> (offset / 2)) & 0xf;
-                info->flags = STD_COM_FLAGS;
+                info->port.flags = STD_COM_FLAGS;
                 if (info->custom_divisor)
-                        info->flags |= ASYNC_SPD_CUST;
+                        info->port.flags |= ASYNC_SPD_CUST;
                 info->magic = ESP_MAGIC;
                 info->close_delay = 5*HZ/10;
                 info->closing_wait = 30*HZ;
@@ -2436,13 +2436,13 @@ static int __init espserial_init(void)
                 info->config.flow_off = flow_off;
                 info->config.pio_threshold = pio_threshold;
                 info->next_port = ports;
-                init_waitqueue_head(&info->open_wait);
-                init_waitqueue_head(&info->close_wait);
+                init_waitqueue_head(&info->port.open_wait);
+                init_waitqueue_head(&info->port.close_wait);
                 init_waitqueue_head(&info->delta_msr_wait);
                 init_waitqueue_head(&info->break_wait);
                 ports = info;
                 printk(KERN_INFO "ttyP%d at 0x%04x (irq = %d) is an ESP ",
-                        info->line, info->port, info->irq);
+                        info->line, info->io_port, info->irq);
 
                 if (info->line % 8) {
                         printk("secondary port\n");
@@ -2498,8 +2498,8 @@ static void __exit espserial_exit(void)
         put_tty_driver(esp_driver);
 
         while (ports) {
-                if (ports->port)
-                        release_region(ports->port, REGION_SIZE);
+                if (ports->io_port)
+                        release_region(ports->io_port, REGION_SIZE);
                 temp_async = ports->next_port;
                 kfree(ports);
                 ports = temp_async;
diff --git a/drivers/char/generic_serial.c b/drivers/char/generic_serial.c
index 252f73e48596..19d3afb0e50c 100644
--- a/drivers/char/generic_serial.c
+++ b/drivers/char/generic_serial.c
@@ -60,7 +60,7 @@ int gs_put_char(struct tty_struct * tty, unsigned char ch)
 
         if (!port) return 0;
 
-        if (! (port->flags & ASYNC_INITIALIZED)) return 0;
+        if (! (port->port.flags & ASYNC_INITIALIZED)) return 0;
 
         /* Take a lock on the serial tranmit buffer! */
         mutex_lock(& port->port_write_mutex);
@@ -103,7 +103,7 @@ int gs_write(struct tty_struct * tty,
 
         if (!port) return 0;
 
-        if (! (port->flags & ASYNC_INITIALIZED))
+        if (! (port->port.flags & ASYNC_INITIALIZED))
                 return 0;
 
         /* get exclusive "write" access to this port (problem 3) */
@@ -141,13 +141,13 @@ int gs_write(struct tty_struct * tty,
         mutex_unlock(& port->port_write_mutex);
 
         gs_dprintk (GS_DEBUG_WRITE, "write: interrupts are %s\n", 
-                    (port->flags & GS_TX_INTEN)?"enabled": "disabled"); 
+                    (port->port.flags & GS_TX_INTEN)?"enabled": "disabled");
 
         if (port->xmit_cnt && 
             !tty->stopped && 
             !tty->hw_stopped &&
-            !(port->flags & GS_TX_INTEN)) {
-                port->flags |= GS_TX_INTEN;
+            !(port->port.flags & GS_TX_INTEN)) {
+                port->port.flags |= GS_TX_INTEN;
                 port->rd->enable_tx_interrupts (port);
         }
         func_exit ();
@@ -208,7 +208,7 @@ static int gs_wait_tx_flushed (void * ptr, unsigned long timeout)
         gs_dprintk (GS_DEBUG_FLUSH, "port=%p.\n", port);
         if (port) {
                 gs_dprintk (GS_DEBUG_FLUSH, "xmit_cnt=%x, xmit_buf=%p, tty=%p.\n", 
-                port->xmit_cnt, port->xmit_buf, port->tty);
+                port->xmit_cnt, port->xmit_buf, port->port.tty);
         }
 
         if (!port || port->xmit_cnt < 0 || !port->xmit_buf) {
@@ -217,7 +217,7 @@ static int gs_wait_tx_flushed (void * ptr, unsigned long timeout)
                 return -EINVAL;  /* This is an error which we don't know how to handle. */
         }
 
-        rcib = gs_real_chars_in_buffer(port->tty);
+        rcib = gs_real_chars_in_buffer(port->port.tty);
 
         if(rcib <= 0) {
                 gs_dprintk (GS_DEBUG_FLUSH, "nothing to wait for.\n");
@@ -236,7 +236,7 @@ static int gs_wait_tx_flushed (void * ptr, unsigned long timeout)
 
         /* the expression is actually jiffies < end_jiffies, but that won't
            work around the wraparound. Tricky eh? */
-        while ((charsleft = gs_real_chars_in_buffer (port->tty)) &&
+        while ((charsleft = gs_real_chars_in_buffer (port->port.tty)) &&
                 time_after (end_jiffies, jiffies)) {
                 /* Units check: 
                    chars * (bits/char) * (jiffies /sec) / (bits/sec) = jiffies!
@@ -309,7 +309,7 @@ void gs_flush_chars(struct tty_struct * tty)
         }
 
         /* Beats me -- REW */
-        port->flags |= GS_TX_INTEN;
+        port->port.flags |= GS_TX_INTEN;
         port->rd->enable_tx_interrupts (port);
         func_exit ();
 }
@@ -329,8 +329,8 @@ void gs_stop(struct tty_struct * tty)
 
         if (port->xmit_cnt && 
             port->xmit_buf && 
-            (port->flags & GS_TX_INTEN) ) {
-                port->flags &= ~GS_TX_INTEN;
+            (port->port.flags & GS_TX_INTEN) ) {
+                port->port.flags &= ~GS_TX_INTEN;
                 port->rd->disable_tx_interrupts (port);
         }
         func_exit ();
@@ -349,8 +349,8 @@ void gs_start(struct tty_struct * tty)
 
         if (port->xmit_cnt && 
             port->xmit_buf && 
-            !(port->flags & GS_TX_INTEN) ) {
-                port->flags |= GS_TX_INTEN;
+            !(port->port.flags & GS_TX_INTEN) ) {
+                port->port.flags |= GS_TX_INTEN;
                 port->rd->enable_tx_interrupts (port);
         }
         func_exit ();
@@ -365,7 +365,7 @@ static void gs_shutdown_port (struct gs_port *port)
         
         if (!port) return;
         
-        if (!(port->flags & ASYNC_INITIALIZED))
+        if (!(port->port.flags & ASYNC_INITIALIZED))
                 return;
 
         spin_lock_irqsave(&port->driver_lock, flags);
@@ -375,12 +375,12 @@ static void gs_shutdown_port (struct gs_port *port)
                 port->xmit_buf = NULL;
         }
 
-        if (port->tty)
-                set_bit(TTY_IO_ERROR, &port->tty->flags);
+        if (port->port.tty)
+                set_bit(TTY_IO_ERROR, &port->port.tty->flags);
 
         port->rd->shutdown_port (port);
 
-        port->flags &= ~ASYNC_INITIALIZED;
+        port->port.flags &= ~ASYNC_INITIALIZED;
         spin_unlock_irqrestore(&port->driver_lock, flags);
 
         func_exit();
@@ -396,16 +396,16 @@ void gs_hangup(struct tty_struct *tty)
         if (!tty) return;
 
         port = tty->driver_data;
-        tty = port->tty;
+        tty = port->port.tty;
         if (!tty) 
                 return;
 
         gs_shutdown_port (port);
-        port->flags &= ~(ASYNC_NORMAL_ACTIVE|GS_ACTIVE);
-        port->tty = NULL;
-        port->count = 0;
+        port->port.flags &= ~(ASYNC_NORMAL_ACTIVE|GS_ACTIVE);
+        port->port.tty = NULL;
+        port->port.count = 0;
 
-        wake_up_interruptible(&port->open_wait);
+        wake_up_interruptible(&port->port.open_wait);
         func_exit ();
 }
 
@@ -424,7 +424,7 @@ int gs_block_til_ready(void *port_, struct file * filp)
 
         if (!port) return 0;
 
-        tty = port->tty;
+        tty = port->port.tty;
 
         if (!tty) return 0;
 
@@ -433,9 +433,9 @@ int gs_block_til_ready(void *port_, struct file * filp)
          * If the device is in the middle of being closed, then block
          * until it's done, and then try again.
          */
-        if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&port->close_wait);
-                if (port->flags & ASYNC_HUP_NOTIFY)
+        if (tty_hung_up_p(filp) || port->port.flags & ASYNC_CLOSING) {
+                interruptible_sleep_on(&port->port.close_wait);
+                if (port->port.flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
                 else
                         return -ERESTARTSYS;
@@ -449,7 +449,7 @@ int gs_block_til_ready(void *port_, struct file * filp)
          */
         if ((filp->f_flags & O_NONBLOCK) ||
             (tty->flags & (1 << TTY_IO_ERROR))) {
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+                port->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
 
@@ -461,34 +461,34 @@ int gs_block_til_ready(void *port_, struct file * filp)
         /*
          * Block waiting for the carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
-         * this loop, port->count is dropped by one, so that
+         * this loop, port->port.count is dropped by one, so that
          * rs_close() knows when to free things.  We restore it upon
          * exit, either normal or abnormal.
          */
         retval = 0;
 
-        add_wait_queue(&port->open_wait, &wait);
+        add_wait_queue(&port->port.open_wait, &wait);
 
         gs_dprintk (GS_DEBUG_BTR, "after add waitq.\n"); 
         spin_lock_irqsave(&port->driver_lock, flags);
         if (!tty_hung_up_p(filp)) {
-                port->count--;
+                port->port.count--;
         }
         spin_unlock_irqrestore(&port->driver_lock, flags);
-        port->blocked_open++;
+        port->port.blocked_open++;
         while (1) {
                 CD = port->rd->get_CD (port);
                 gs_dprintk (GS_DEBUG_BTR, "CD is now %d.\n", CD);
                 set_current_state (TASK_INTERRUPTIBLE);
                 if (tty_hung_up_p(filp) ||
-                    !(port->flags & ASYNC_INITIALIZED)) {
-                        if (port->flags & ASYNC_HUP_NOTIFY)
+                    !(port->port.flags & ASYNC_INITIALIZED)) {
+                        if (port->port.flags & ASYNC_HUP_NOTIFY)
                                 retval = -EAGAIN;
                         else
                                 retval = -ERESTARTSYS;
                         break;
                 }
-                if (!(port->flags & ASYNC_CLOSING) &&
+                if (!(port->port.flags & ASYNC_CLOSING) &&
                     (do_clocal || CD))
                         break;
                 gs_dprintk (GS_DEBUG_BTR, "signal_pending is now: %d (%lx)\n", 
@@ -500,17 +500,17 @@ int gs_block_til_ready(void *port_, struct file * filp)
                 schedule();
         }
         gs_dprintk (GS_DEBUG_BTR, "Got out of the loop. (%d)\n",
-                    port->blocked_open);
+                    port->port.blocked_open);
         set_current_state (TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
+        remove_wait_queue(&port->port.open_wait, &wait);
         if (!tty_hung_up_p(filp)) {
-                port->count++;
+                port->port.count++;
         }
-        port->blocked_open--;
+        port->port.blocked_open--;
         if (retval)
                 return retval;
 
-        port->flags |= ASYNC_NORMAL_ACTIVE;
+        port->port.flags |= ASYNC_NORMAL_ACTIVE;
         func_exit ();
         return 0;
 }                        
@@ -529,10 +529,10 @@ void gs_close(struct tty_struct * tty, struct file * filp)
 
         if (!port) return;
 
-        if (!port->tty) {
+        if (!port->port.tty) {
                 /* This seems to happen when this is called from vhangup. */
-                gs_dprintk (GS_DEBUG_CLOSE, "gs: Odd: port->tty is NULL\n");
-                port->tty = tty;
+                gs_dprintk (GS_DEBUG_CLOSE, "gs: Odd: port->port.tty is NULL\n");
+                port->port.tty = tty;
         }
 
         spin_lock_irqsave(&port->driver_lock, flags);
@@ -545,23 +545,23 @@ void gs_close(struct tty_struct * tty, struct file * filp)
                 return;
         }
 
-        if ((tty->count == 1) && (port->count != 1)) {
+        if ((tty->count == 1) && (port->port.count != 1)) {
                 printk(KERN_ERR "gs: gs_close port %p: bad port count;"
-                       " tty->count is 1, port count is %d\n", port, port->count);
-                port->count = 1;
+                       " tty->count is 1, port count is %d\n", port, port->port.count);
+                port->port.count = 1;
         }
-        if (--port->count < 0) {
-                printk(KERN_ERR "gs: gs_close port %p: bad port count: %d\n", port, port->count);
-                port->count = 0;
+        if (--port->port.count < 0) {
+                printk(KERN_ERR "gs: gs_close port %p: bad port count: %d\n", port, port->port.count);
+                port->port.count = 0;
         }
 
-        if (port->count) {
-                gs_dprintk(GS_DEBUG_CLOSE, "gs_close port %p: count: %d\n", port, port->count);
+        if (port->port.count) {
+                gs_dprintk(GS_DEBUG_CLOSE, "gs_close port %p: count: %d\n", port, port->port.count);
                 spin_unlock_irqrestore(&port->driver_lock, flags);
                 func_exit ();
                 return;
         }
-        port->flags |= ASYNC_CLOSING;
+        port->port.flags |= ASYNC_CLOSING;
 
         /*
          * Now we wait for the transmit buffer to clear; and we notify 
@@ -585,7 +585,7 @@ void gs_close(struct tty_struct * tty, struct file * filp)
         if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
                 gs_wait_tx_flushed (port, port->closing_wait);
 
-        port->flags &= ~GS_ACTIVE;
+        port->port.flags &= ~GS_ACTIVE;
 
         gs_flush_buffer(tty);
 
@@ -595,18 +595,18 @@ void gs_close(struct tty_struct * tty, struct file * filp)
         port->event = 0;
         port->rd->close (port);
         port->rd->shutdown_port (port);
-        port->tty = NULL;
+        port->port.tty = NULL;
 
-        if (port->blocked_open) {
+        if (port->port.blocked_open) {
                 if (port->close_delay) {
                         spin_unlock_irqrestore(&port->driver_lock, flags);
                         msleep_interruptible(jiffies_to_msecs(port->close_delay));
                         spin_lock_irqsave(&port->driver_lock, flags);
                 }
-                wake_up_interruptible(&port->open_wait);
+                wake_up_interruptible(&port->port.open_wait);
         }
-        port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING | ASYNC_INITIALIZED);
-        wake_up_interruptible(&port->close_wait);
+        port->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING | ASYNC_INITIALIZED);
+        wake_up_interruptible(&port->port.close_wait);
 
         func_exit ();
 }
@@ -626,10 +626,10 @@ void gs_set_termios (struct tty_struct * tty,
         port = tty->driver_data;
 
         if (!port) return;
-        if (!port->tty) {
+        if (!port->port.tty) {
                 /* This seems to happen when this is called after gs_close. */
-                gs_dprintk (GS_DEBUG_TERMIOS, "gs: Odd: port->tty is NULL\n");
-                port->tty = tty;
+                gs_dprintk (GS_DEBUG_TERMIOS, "gs: Odd: port->port.tty is NULL\n");
+                port->port.tty = tty;
         }
 
 
@@ -651,15 +651,15 @@ void gs_set_termios (struct tty_struct * tty,
         baudrate = tty_get_baud_rate(tty);
 
         if ((tiosp->c_cflag & CBAUD) == B38400) {
-                if (     (port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                if (     (port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
                         baudrate = 57600;
-                else if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                else if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
                         baudrate = 115200;
-                else if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                else if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
                         baudrate = 230400;
-                else if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                else if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
                         baudrate = 460800;
-                else if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
+                else if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
                         baudrate = (port->baud_base / port->custom_divisor);
         }
 
@@ -715,7 +715,7 @@ int gs_init_port(struct gs_port *port)
 
         func_enter ();
 
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (port->port.flags & ASYNC_INITIALIZED) {
                 func_exit ();
                 return 0;
         }
@@ -737,15 +737,15 @@ int gs_init_port(struct gs_port *port)
         }
 
         spin_lock_irqsave (&port->driver_lock, flags);
-        if (port->tty) 
-                clear_bit(TTY_IO_ERROR, &port->tty->flags);
+        if (port->port.tty)
+                clear_bit(TTY_IO_ERROR, &port->port.tty->flags);
         mutex_init(&port->port_write_mutex);
         port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
         spin_unlock_irqrestore(&port->driver_lock, flags);
-        gs_set_termios(port->tty, NULL);
+        gs_set_termios(port->port.tty, NULL);
         spin_lock_irqsave (&port->driver_lock, flags);
-        port->flags |= ASYNC_INITIALIZED;
-        port->flags &= ~GS_TX_INTEN;
+        port->port.flags |= ASYNC_INITIALIZED;
+        port->port.flags &= ~GS_TX_INTEN;
 
         spin_unlock_irqrestore(&port->driver_lock, flags);
         func_exit ();
@@ -764,11 +764,11 @@ int gs_setserial(struct gs_port *port, struct serial_struct __user *sp)
                 if ((sio.baud_base != port->baud_base) ||
                     (sio.close_delay != port->close_delay) ||
                     ((sio.flags & ~ASYNC_USR_MASK) !=
-                     (port->flags & ~ASYNC_USR_MASK)))
+                     (port->port.flags & ~ASYNC_USR_MASK)))
                         return(-EPERM);
         } 
 
-        port->flags = (port->flags & ~ASYNC_USR_MASK) |
+        port->port.flags = (port->port.flags & ~ASYNC_USR_MASK) |
                 (sio.flags & ASYNC_USR_MASK);
   
         port->baud_base = sio.baud_base;
@@ -776,7 +776,7 @@ int gs_setserial(struct gs_port *port, struct serial_struct __user *sp)
         port->closing_wait = sio.closing_wait;
         port->custom_divisor = sio.custom_divisor;
 
-        gs_set_termios (port->tty, NULL);
+        gs_set_termios (port->port.tty, NULL);
 
         return 0;
 }
@@ -793,7 +793,7 @@ int gs_getserial(struct gs_port *port, struct serial_struct __user *sp)
         struct serial_struct    sio;
 
         memset(&sio, 0, sizeof(struct serial_struct));
-        sio.flags = port->flags;
+        sio.flags = port->port.flags;
         sio.baud_base = port->baud_base;
         sio.close_delay = port->close_delay;
         sio.closing_wait = port->closing_wait;
@@ -821,10 +821,10 @@ void gs_got_break(struct gs_port *port)
 {
         func_enter ();
 
-        tty_insert_flip_char(port->tty, 0, TTY_BREAK);
-        tty_schedule_flip(port->tty);
-        if (port->flags & ASYNC_SAK) {
-                do_SAK (port->tty);
+        tty_insert_flip_char(port->port.tty, 0, TTY_BREAK);
+        tty_schedule_flip(port->port.tty);
+        if (port->port.flags & ASYNC_SAK) {
+                do_SAK (port->port.tty);
         }
 
         func_exit ();
diff --git a/drivers/char/ip2/i2lib.c b/drivers/char/ip2/i2lib.c
index 938879cc7bcc..0061e18aff60 100644
--- a/drivers/char/ip2/i2lib.c
+++ b/drivers/char/ip2/i2lib.c
@@ -868,11 +868,11 @@ i2Input(i2ChanStrPtr pCh)
                 amountToMove = count;
         }
         // Move the first block
-        pCh->pTTY->ldisc.receive_buf( pCh->pTTY, 
+        pCh->pTTY->ldisc.ops->receive_buf( pCh->pTTY,
                  &(pCh->Ibuf[stripIndex]), NULL, amountToMove );
         // If we needed to wrap, do the second data move
         if (count > amountToMove) {
-                pCh->pTTY->ldisc.receive_buf( pCh->pTTY, 
+                pCh->pTTY->ldisc.ops->receive_buf( pCh->pTTY,
                  pCh->Ibuf, NULL, count - amountToMove );
         }
         // Bump and wrap the stripIndex all at once by the amount of data read. This
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 9a2394cda943..5dc74404058f 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -1289,11 +1289,12 @@ static void do_input(struct work_struct *work)
 // code duplicated from n_tty (ldisc)
 static inline void  isig(int sig, struct tty_struct *tty, int flush)
 {
+        /* FIXME: This is completely bogus */
         if (tty->pgrp)
                 kill_pgrp(tty->pgrp, sig, 1);
         if (flush || !L_NOFLSH(tty)) {
-                if ( tty->ldisc.flush_buffer )  
-                        tty->ldisc.flush_buffer(tty);
+                if ( tty->ldisc.ops->flush_buffer )  
+                        tty->ldisc.ops->flush_buffer(tty);
                 i2InputFlush( tty->driver_data );
         }
 }
@@ -1342,7 +1343,7 @@ static void do_status(struct work_struct *work)
                 }
                 tmp = pCh->pTTY->real_raw;
                 pCh->pTTY->real_raw = 0;
-                pCh->pTTY->ldisc.receive_buf( pCh->pTTY, &brkc, &brkf, 1 );
+                pCh->pTTY->ldisc->ops.receive_buf( pCh->pTTY, &brkc, &brkf, 1 );
                 pCh->pTTY->real_raw = tmp;
         }
 #endif /* NEVER_HAPPENS_AS_SETUP_XXX */
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 4f3cefa8eb0e..d4281df10c22 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -198,17 +198,10 @@ struct	isi_board {
 
 struct  isi_port {
         unsigned short          magic;
-        unsigned int            flags;
-        int                     count;
-        int                     blocked_open;
-        int                     close_delay;
+        struct tty_port         port;
         u16                     channel;
         u16                     status;
-        u16                     closing_wait;
         struct isi_board        *card;
-        struct tty_struct       *tty;
-        wait_queue_head_t       close_wait;
-        wait_queue_head_t       open_wait;
         unsigned char           *xmit_buf;
         int                     xmit_head;
         int                     xmit_tail;
@@ -430,11 +423,11 @@ static void isicom_tx(unsigned long _data)
 
         for (; count > 0; count--, port++) {
                 /* port not active or tx disabled to force flow control */
-                if (!(port->flags & ASYNC_INITIALIZED) ||
+                if (!(port->port.flags & ASYNC_INITIALIZED) ||
                                 !(port->status & ISI_TXOK))
                         continue;
 
-                tty = port->tty;
+                tty = port->port.tty;
 
                 if (tty == NULL)
                         continue;
@@ -458,7 +451,7 @@ static void isicom_tx(unsigned long _data)
                         if (residue == YES) {
                                 residue = NO;
                                 if (cnt > 0) {
-                                        wrd |= (port->xmit_buf[port->xmit_tail]
+                                        wrd |= (port->port.xmit_buf[port->xmit_tail]
                                                                         << 8);
                                         port->xmit_tail = (port->xmit_tail + 1)
                                                 & (SERIAL_XMIT_SIZE - 1);
@@ -474,14 +467,14 @@ static void isicom_tx(unsigned long _data)
                         if (cnt <= 0)
                                 break;
                         word_count = cnt >> 1;
-                        outsw(base, port->xmit_buf+port->xmit_tail, word_count);
+                        outsw(base, port->port.xmit_buf+port->xmit_tail, word_count);
                         port->xmit_tail = (port->xmit_tail
                                 + (word_count << 1)) & (SERIAL_XMIT_SIZE - 1);
                         txcount -= (word_count << 1);
                         port->xmit_cnt -= (word_count << 1);
                         if (cnt & 0x0001) {
                                 residue = YES;
-                                wrd = port->xmit_buf[port->xmit_tail];
+                                wrd = port->port.xmit_buf[port->xmit_tail];
                                 port->xmit_tail = (port->xmit_tail + 1)
                                         & (SERIAL_XMIT_SIZE - 1);
                                 port->xmit_cnt--;
@@ -548,13 +541,13 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                 return IRQ_HANDLED;
         }
         port = card->ports + channel;
-        if (!(port->flags & ASYNC_INITIALIZED)) {
+        if (!(port->port.flags & ASYNC_INITIALIZED)) {
                 outw(0x0000, base+0x04); /* enable interrupts */
                 spin_unlock(&card->card_lock);
                 return IRQ_HANDLED;
         }
 
-        tty = port->tty;
+        tty = port->port.tty;
         if (tty == NULL) {
                 word_count = byte_count >> 1;
                 while (byte_count > 1) {
@@ -572,7 +565,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                 header = inw(base);
                 switch (header & 0xff) {
                 case 0: /* Change in EIA signals */
-                        if (port->flags & ASYNC_CHECK_CD) {
+                        if (port->port.flags & ASYNC_CHECK_CD) {
                                 if (port->status & ISI_DCD) {
                                         if (!(header & ISI_DCD)) {
                                         /* Carrier has been lost  */
@@ -585,7 +578,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                                 /* Carrier has been detected */
                                         pr_dbg("interrupt: DCD->high.\n");
                                         port->status |= ISI_DCD;
-                                        wake_up_interruptible(&port->open_wait);
+                                        wake_up_interruptible(&port->port.open_wait);
                                 }
                         } else {
                                 if (header & ISI_DCD)
@@ -594,17 +587,17 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                                         port->status &= ~ISI_DCD;
                         }
 
-                        if (port->flags & ASYNC_CTS_FLOW) {
-                                if (port->tty->hw_stopped) {
+                        if (port->port.flags & ASYNC_CTS_FLOW) {
+                                if (port->port.tty->hw_stopped) {
                                         if (header & ISI_CTS) {
-                                                port->tty->hw_stopped = 0;
+                                                port->port.tty->hw_stopped = 0;
                                                 /* start tx ing */
                                                 port->status |= (ISI_TXOK
                                                         | ISI_CTS);
                                                 tty_wakeup(tty);
                                         }
                                 } else if (!(header & ISI_CTS)) {
-                                        port->tty->hw_stopped = 1;
+                                        port->port.tty->hw_stopped = 1;
                                         /* stop tx ing */
                                         port->status &= ~(ISI_TXOK | ISI_CTS);
                                 }
@@ -629,7 +622,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
 
                 case 1: /* Received Break !!! */
                         tty_insert_flip_char(tty, 0, TTY_BREAK);
-                        if (port->flags & ASYNC_SAK)
+                        if (port->port.flags & ASYNC_SAK)
                                 do_SAK(tty);
                         tty_flip_buffer_push(tty);
                         break;
@@ -681,7 +674,7 @@ static void isicom_config_port(struct isi_port *port)
                 shift_count = card->shift_count;
         unsigned char flow_ctrl;
 
-        tty = port->tty;
+        tty = port->port.tty;
 
         if (tty == NULL)
                 return;
@@ -697,7 +690,7 @@ static void isicom_config_port(struct isi_port *port)
 
                 /* 1,2,3,4 => 57.6, 115.2, 230, 460 kbps resp. */
                 if (baud < 1 || baud > 4)
-                        port->tty->termios->c_cflag &= ~CBAUDEX;
+                        port->port.tty->termios->c_cflag &= ~CBAUDEX;
                 else
                         baud += 15;
         }
@@ -708,13 +701,13 @@ static void isicom_config_port(struct isi_port *port)
                  *  the 'setserial' utility.
                  */
 
-                if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
                         baud++; /*  57.6 Kbps */
-                if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
                         baud += 2; /*  115  Kbps */
-                if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
                         baud += 3; /* 230 kbps*/
-                if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
                         baud += 4; /* 460 kbps*/
         }
         if (linuxb_to_isib[baud] == -1) {
@@ -754,15 +747,15 @@ static void isicom_config_port(struct isi_port *port)
                 InterruptTheCard(base);
         }
         if (C_CLOCAL(tty))
-                port->flags &= ~ASYNC_CHECK_CD;
+                port->port.flags &= ~ASYNC_CHECK_CD;
         else
-                port->flags |= ASYNC_CHECK_CD;
+                port->port.flags |= ASYNC_CHECK_CD;
 
         /* flow control settings ...*/
         flow_ctrl = 0;
-        port->flags &= ~ASYNC_CTS_FLOW;
+        port->port.flags &= ~ASYNC_CTS_FLOW;
         if (C_CRTSCTS(tty)) {
-                port->flags |= ASYNC_CTS_FLOW;
+                port->port.flags |= ASYNC_CTS_FLOW;
                 flow_ctrl |= ISICOM_CTSRTS;
         }
         if (I_IXON(tty))
@@ -809,23 +802,15 @@ static int isicom_setup_port(struct isi_port *port)
         struct isi_board *card = port->card;
         unsigned long flags;
 
-        if (port->flags & ASYNC_INITIALIZED)
+        if (port->port.flags & ASYNC_INITIALIZED)
                 return 0;
-        if (!port->xmit_buf) {
-                /* Relies on BKL */
-                unsigned long page  = get_zeroed_page(GFP_KERNEL);
-                if (page == 0)
-                        return -ENOMEM;
-                if (port->xmit_buf)
-                        free_page(page);
-                else
-                        port->xmit_buf = (unsigned char *) page;
-        }
+        if (tty_port_alloc_xmit_buf(&port->port) < 0)
+                return -ENOMEM;
 
         spin_lock_irqsave(&card->card_lock, flags);
-        if (port->tty)
-                clear_bit(TTY_IO_ERROR, &port->tty->flags);
-        if (port->count == 1)
+        if (port->port.tty)
+                clear_bit(TTY_IO_ERROR, &port->port.tty->flags);
+        if (port->port.count == 1)
                 card->count++;
 
         port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
@@ -839,7 +824,7 @@ static int isicom_setup_port(struct isi_port *port)
         }
 
         isicom_config_port(port);
-        port->flags |= ASYNC_INITIALIZED;
+        port->port.flags |= ASYNC_INITIALIZED;
         spin_unlock_irqrestore(&card->card_lock, flags);
 
         return 0;
@@ -855,10 +840,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
         /* block if port is in the process of being closed */
 
-        if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
+        if (tty_hung_up_p(filp) || port->port.flags & ASYNC_CLOSING) {
                 pr_dbg("block_til_ready: close in progress.\n");
-                interruptible_sleep_on(&port->close_wait);
-                if (port->flags & ASYNC_HUP_NOTIFY)
+                interruptible_sleep_on(&port->port.close_wait);
+                if (port->port.flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
                 else
                         return -ERESTARTSYS;
@@ -869,7 +854,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         if ((filp->f_flags & O_NONBLOCK) ||
                         (tty->flags & (1 << TTY_IO_ERROR))) {
                 pr_dbg("block_til_ready: non-block mode.\n");
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+                port->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
 
@@ -879,26 +864,26 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         /* block waiting for DCD to be asserted, and while
                                                 callout dev is busy */
         retval = 0;
-        add_wait_queue(&port->open_wait, &wait);
+        add_wait_queue(&port->port.open_wait, &wait);
 
         spin_lock_irqsave(&card->card_lock, flags);
         if (!tty_hung_up_p(filp))
-                port->count--;
-        port->blocked_open++;
+                port->port.count--;
+        port->port.blocked_open++;
         spin_unlock_irqrestore(&card->card_lock, flags);
 
         while (1) {
                 raise_dtr_rts(port);
 
                 set_current_state(TASK_INTERRUPTIBLE);
-                if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)) {
-                        if (port->flags & ASYNC_HUP_NOTIFY)
+                if (tty_hung_up_p(filp) || !(port->port.flags & ASYNC_INITIALIZED)) {
+                        if (port->port.flags & ASYNC_HUP_NOTIFY)
                                 retval = -EAGAIN;
                         else
                                 retval = -ERESTARTSYS;
                         break;
                 }
-                if (!(port->flags & ASYNC_CLOSING) &&
+                if (!(port->port.flags & ASYNC_CLOSING) &&
                                 (do_clocal || (port->status & ISI_DCD))) {
                         break;
                 }
@@ -909,15 +894,15 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 schedule();
         }
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
+        remove_wait_queue(&port->port.open_wait, &wait);
         spin_lock_irqsave(&card->card_lock, flags);
         if (!tty_hung_up_p(filp))
-                port->count++;
-        port->blocked_open--;
+                port->port.count++;
+        port->port.blocked_open--;
         spin_unlock_irqrestore(&card->card_lock, flags);
         if (retval)
                 return retval;
-        port->flags |= ASYNC_NORMAL_ACTIVE;
+        port->port.flags |= ASYNC_NORMAL_ACTIVE;
         return 0;
 }
 
@@ -947,9 +932,9 @@ static int isicom_open(struct tty_struct *tty, struct file *filp)
 
         isicom_setup_board(card);
 
-        port->count++;
+        port->port.count++;
         tty->driver_data = port;
-        port->tty = tty;
+        port->port.tty = tty;
         error = isicom_setup_port(port);
         if (error == 0)
                 error = block_til_ready(tty, filp, port);
@@ -970,18 +955,15 @@ static void isicom_shutdown_port(struct isi_port *port)
         struct isi_board *card = port->card;
         struct tty_struct *tty;
 
-        tty = port->tty;
+        tty = port->port.tty;
 
-        if (!(port->flags & ASYNC_INITIALIZED))
+        if (!(port->port.flags & ASYNC_INITIALIZED))
                 return;
 
-        if (port->xmit_buf) {
-                free_page((unsigned long) port->xmit_buf);
-                port->xmit_buf = NULL;
-        }
-        port->flags &= ~ASYNC_INITIALIZED;
+        tty_port_free_xmit_buf(&port->port);
+        port->port.flags &= ~ASYNC_INITIALIZED;
         /* 3rd October 2000 : Vinayak P Risbud */
-        port->tty = NULL;
+        port->port.tty = NULL;
 
         /*Fix done by Anil .S on 30-04-2001
         remote login through isi port has dtr toggle problem
@@ -1046,33 +1028,33 @@ static void isicom_close(struct tty_struct *tty, struct file *filp)
                 return;
         }
 
-        if (tty->count == 1 && port->count != 1) {
+        if (tty->count == 1 && port->port.count != 1) {
                 printk(KERN_WARNING "ISICOM:(0x%lx) isicom_close: bad port "
                         "count tty->count = 1 port count = %d.\n",
-                        card->base, port->count);
-                port->count = 1;
+                        card->base, port->port.count);
+                port->port.count = 1;
         }
-        if (--port->count < 0) {
+        if (--port->port.count < 0) {
                 printk(KERN_WARNING "ISICOM:(0x%lx) isicom_close: bad port "
                         "count for channel%d = %d", card->base, port->channel,
-                        port->count);
-                port->count = 0;
+                        port->port.count);
+                port->port.count = 0;
         }
 
-        if (port->count) {
+        if (port->port.count) {
                 spin_unlock_irqrestore(&card->card_lock, flags);
                 return;
         }
-        port->flags |= ASYNC_CLOSING;
+        port->port.flags |= ASYNC_CLOSING;
         tty->closing = 1;
         spin_unlock_irqrestore(&card->card_lock, flags);
 
-        if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, port->closing_wait);
+        if (port->port.closing_wait != ASYNC_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, port->port.closing_wait);
         /* indicate to the card that no more data can be received
            on this port */
         spin_lock_irqsave(&card->card_lock, flags);
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (port->port.flags & ASYNC_INITIALIZED) {
                 card->port_status &= ~(1 << port->channel);
                 outw(card->port_status, card->base + 0x02);
         }
@@ -1085,18 +1067,18 @@ static void isicom_close(struct tty_struct *tty, struct file *filp)
         spin_lock_irqsave(&card->card_lock, flags);
         tty->closing = 0;
 
-        if (port->blocked_open) {
+        if (port->port.blocked_open) {
                 spin_unlock_irqrestore(&card->card_lock, flags);
-                if (port->close_delay) {
+                if (port->port.close_delay) {
                         pr_dbg("scheduling until time out.\n");
                         msleep_interruptible(
-                                jiffies_to_msecs(port->close_delay));
+                                jiffies_to_msecs(port->port.close_delay));
                 }
                 spin_lock_irqsave(&card->card_lock, flags);
-                wake_up_interruptible(&port->open_wait);
+                wake_up_interruptible(&port->port.open_wait);
         }
-        port->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
-        wake_up_interruptible(&port->close_wait);
+        port->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
+        wake_up_interruptible(&port->port.close_wait);
         spin_unlock_irqrestore(&card->card_lock, flags);
 }
 
@@ -1112,9 +1094,6 @@ static int isicom_write(struct tty_struct *tty,	const unsigned char *buf,
         if (isicom_paranoia_check(port, tty->name, "isicom_write"))
                 return 0;
 
-        if (!port->xmit_buf)
-                return 0;
-
         spin_lock_irqsave(&card->card_lock, flags);
 
         while (1) {
@@ -1123,7 +1102,7 @@ static int isicom_write(struct tty_struct *tty,	const unsigned char *buf,
                 if (cnt <= 0)
                         break;
 
-                memcpy(port->xmit_buf + port->xmit_head, buf, cnt);
+                memcpy(port->port.xmit_buf + port->xmit_head, buf, cnt);
                 port->xmit_head = (port->xmit_head + cnt) & (SERIAL_XMIT_SIZE
                         - 1);
                 port->xmit_cnt += cnt;
@@ -1147,16 +1126,13 @@ static int isicom_put_char(struct tty_struct *tty, unsigned char ch)
         if (isicom_paranoia_check(port, tty->name, "isicom_put_char"))
                 return 0;
 
-        if (!port->xmit_buf)
-                return 0;
-
         spin_lock_irqsave(&card->card_lock, flags);
         if (port->xmit_cnt >= SERIAL_XMIT_SIZE - 1) {
                 spin_unlock_irqrestore(&card->card_lock, flags);
                 return 0;
         }
 
-        port->xmit_buf[port->xmit_head++] = ch;
+        port->port.xmit_buf[port->xmit_head++] = ch;
         port->xmit_head &= (SERIAL_XMIT_SIZE - 1);
         port->xmit_cnt++;
         spin_unlock_irqrestore(&card->card_lock, flags);
@@ -1172,7 +1148,7 @@ static void isicom_flush_chars(struct tty_struct *tty)
                 return;
 
         if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-                        !port->xmit_buf)
+                        !port->port.xmit_buf)
                 return;
 
         /* this tells the transmitter to consider this port for
@@ -1274,23 +1250,23 @@ static int isicom_set_serial_info(struct isi_port *port,
 
         lock_kernel();
 
-        reconfig_port = ((port->flags & ASYNC_SPD_MASK) !=
+        reconfig_port = ((port->port.flags & ASYNC_SPD_MASK) !=
                 (newinfo.flags & ASYNC_SPD_MASK));
 
         if (!capable(CAP_SYS_ADMIN)) {
-                if ((newinfo.close_delay != port->close_delay) ||
-                                (newinfo.closing_wait != port->closing_wait) ||
+                if ((newinfo.close_delay != port->port.close_delay) ||
+                                (newinfo.closing_wait != port->port.closing_wait) ||
                                 ((newinfo.flags & ~ASYNC_USR_MASK) !=
-                                (port->flags & ~ASYNC_USR_MASK))) {
+                                (port->port.flags & ~ASYNC_USR_MASK))) {
                         unlock_kernel();
                         return -EPERM;
                 }
-                port->flags = ((port->flags & ~ASYNC_USR_MASK) |
+                port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK) |
                                 (newinfo.flags & ASYNC_USR_MASK));
         } else {
-                port->close_delay = newinfo.close_delay;
-                port->closing_wait = newinfo.closing_wait;
-                port->flags = ((port->flags & ~ASYNC_FLAGS) |
+                port->port.close_delay = newinfo.close_delay;
+                port->port.closing_wait = newinfo.closing_wait;
+                port->port.flags = ((port->port.flags & ~ASYNC_FLAGS) |
                                 (newinfo.flags & ASYNC_FLAGS));
         }
         if (reconfig_port) {
@@ -1314,10 +1290,10 @@ static int isicom_get_serial_info(struct isi_port *port,
         out_info.line = port - isi_ports;
         out_info.port = port->card->base;
         out_info.irq = port->card->irq;
-        out_info.flags = port->flags;
+        out_info.flags = port->port.flags;
 /*      out_info.baud_base = ? */
-        out_info.close_delay = port->close_delay;
-        out_info.closing_wait = port->closing_wait;
+        out_info.close_delay = port->port.close_delay;
+        out_info.closing_wait = port->port.closing_wait;
         unlock_kernel();
         if (copy_to_user(info, &out_info, sizeof(out_info)))
                 return -EFAULT;
@@ -1454,10 +1430,10 @@ static void isicom_hangup(struct tty_struct *tty)
         isicom_shutdown_port(port);
         spin_unlock_irqrestore(&port->card->card_lock, flags);
 
-        port->count = 0;
-        port->flags &= ~ASYNC_NORMAL_ACTIVE;
-        port->tty = NULL;
-        wake_up_interruptible(&port->open_wait);
+        port->port.count = 0;
+        port->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        port->port.tty = NULL;
+        wake_up_interruptible(&port->port.open_wait);
 }
 
 
@@ -1736,6 +1712,12 @@ static int __devinit isicom_probe(struct pci_dev *pdev,
         if (card_count >= BOARD_COUNT)
                 goto err;
 
+        retval = pci_enable_device(pdev);
+        if (retval) {
+                dev_err(&pdev->dev, "failed to enable\n");
+                goto err;
+        }
+
         dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);
 
         /* allot the first empty slot in the array */
@@ -1790,6 +1772,7 @@ errunrr:
 errdec:
         board->base = 0;
         card_count--;
+        pci_disable_device(pdev);
 err:
         return retval;
 }
@@ -1806,6 +1789,7 @@ static void __devexit isicom_remove(struct pci_dev *pdev)
         pci_release_region(pdev, 3);
         board->base = 0;
         card_count--;
+        pci_disable_device(pdev);
 }
 
 static int __init isicom_init(void)
@@ -1818,14 +1802,13 @@ static int __init isicom_init(void)
                 isi_card[idx].ports = port;
                 spin_lock_init(&isi_card[idx].card_lock);
                 for (channel = 0; channel < 16; channel++, port++) {
+                        tty_port_init(&port->port);
                         port->magic = ISICOM_MAGIC;
                         port->card = &isi_card[idx];
                         port->channel = channel;
-                        port->close_delay = 50 * HZ/100;
-                        port->closing_wait = 3000 * HZ/100;
+                        port->port.close_delay = 50 * HZ/100;
+                        port->port.closing_wait = 3000 * HZ/100;
                         port->status = 0;
-                        init_waitqueue_head(&port->open_wait);
-                        init_waitqueue_head(&port->close_wait);
                         /*  . . .  */
                 }
                 isi_card[idx].base = 0;
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 7c8b62f162bf..6ef1c565705c 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -735,8 +735,8 @@ static void stli_cleanup_ports(struct stlibrd *brdp)
         for (j = 0; j < STL_MAXPORTS; j++) {
                 portp = brdp->ports[j];
                 if (portp != NULL) {
-                        if (portp->tty != NULL)
-                                tty_hangup(portp->tty);
+                        if (portp->port.tty != NULL)
+                                tty_hangup(portp->port.tty);
                         kfree(portp);
                 }
         }
@@ -811,9 +811,9 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
  *      The sleep here does not need interrupt protection since the wakeup
  *      for it is done with the same context.
  */
-        if (portp->flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&portp->close_wait);
-                if (portp->flags & ASYNC_HUP_NOTIFY)
+        if (portp->port.flags & ASYNC_CLOSING) {
+                interruptible_sleep_on(&portp->port.close_wait);
+                if (portp->port.flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
                 return -ERESTARTSYS;
         }
@@ -824,7 +824,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
  *      requires several commands to the board we will need to wait for any
  *      other open that is already initializing the port.
  */
-        portp->tty = tty;
+        portp->port.tty = tty;
         tty->driver_data = portp;
         portp->refcount++;
 
@@ -833,10 +833,10 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
         if (signal_pending(current))
                 return -ERESTARTSYS;
 
-        if ((portp->flags & ASYNC_INITIALIZED) == 0) {
+        if ((portp->port.flags & ASYNC_INITIALIZED) == 0) {
                 set_bit(ST_INITIALIZING, &portp->state);
                 if ((rc = stli_initopen(brdp, portp)) >= 0) {
-                        portp->flags |= ASYNC_INITIALIZED;
+                        portp->port.flags |= ASYNC_INITIALIZED;
                         clear_bit(TTY_IO_ERROR, &tty->flags);
                 }
                 clear_bit(ST_INITIALIZING, &portp->state);
@@ -851,9 +851,9 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
  *      The sleep here does not need interrupt protection since the wakeup
  *      for it is done with the same context.
  */
-        if (portp->flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&portp->close_wait);
-                if (portp->flags & ASYNC_HUP_NOTIFY)
+        if (portp->port.flags & ASYNC_CLOSING) {
+                interruptible_sleep_on(&portp->port.close_wait);
+                if (portp->port.flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
                 return -ERESTARTSYS;
         }
@@ -867,7 +867,7 @@ static int stli_open(struct tty_struct *tty, struct file *filp)
                 if ((rc = stli_waitcarrier(brdp, portp, filp)) != 0)
                         return rc;
         }
-        portp->flags |= ASYNC_NORMAL_ACTIVE;
+        portp->port.flags |= ASYNC_NORMAL_ACTIVE;
         return 0;
 }
 
@@ -895,7 +895,7 @@ static void stli_close(struct tty_struct *tty, struct file *filp)
                 return;
         }
 
-        portp->flags |= ASYNC_CLOSING;
+        portp->port.flags |= ASYNC_CLOSING;
 
 /*
  *      May want to wait for data to drain before closing. The BUSY flag
@@ -911,7 +911,7 @@ static void stli_close(struct tty_struct *tty, struct file *filp)
         if (portp->closing_wait != ASYNC_CLOSING_WAIT_NONE)
                 tty_wait_until_sent(tty, portp->closing_wait);
 
-        portp->flags &= ~ASYNC_INITIALIZED;
+        portp->port.flags &= ~ASYNC_INITIALIZED;
         brdp = stli_brds[portp->brdnr];
         stli_rawclose(brdp, portp, 0, 0);
         if (tty->termios->c_cflag & HUPCL) {
@@ -931,16 +931,16 @@ static void stli_close(struct tty_struct *tty, struct file *filp)
         stli_flushbuffer(tty);
 
         tty->closing = 0;
-        portp->tty = NULL;
+        portp->port.tty = NULL;
 
         if (portp->openwaitcnt) {
                 if (portp->close_delay)
                         msleep_interruptible(jiffies_to_msecs(portp->close_delay));
-                wake_up_interruptible(&portp->open_wait);
+                wake_up_interruptible(&portp->port.open_wait);
         }
 
-        portp->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&portp->close_wait);
+        portp->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        wake_up_interruptible(&portp->port.close_wait);
 }
 
 /*****************************************************************************/
@@ -970,7 +970,7 @@ static int stli_initopen(struct stlibrd *brdp, struct stliport *portp)
             sizeof(asynotify_t), 0)) < 0)
                 return rc;
 
-        tty = portp->tty;
+        tty = portp->port.tty;
         if (tty == NULL)
                 return -ENODEV;
         stli_mkasyport(portp, &aport, tty->termios);
@@ -1169,7 +1169,7 @@ static int stli_setport(struct stliport *portp)
 
         if (portp == NULL)
                 return -ENODEV;
-        if (portp->tty == NULL)
+        if (portp->port.tty == NULL)
                 return -ENODEV;
         if (portp->brdnr >= stli_nrbrds)
                 return -ENODEV;
@@ -1177,7 +1177,7 @@ static int stli_setport(struct stliport *portp)
         if (brdp == NULL)
                 return -ENODEV;
 
-        stli_mkasyport(portp, &aport, portp->tty->termios);
+        stli_mkasyport(portp, &aport, portp->port.tty->termios);
         return(stli_cmdwait(brdp, portp, A_SETPORT, &aport, sizeof(asyport_t), 0));
 }
 
@@ -1196,7 +1196,7 @@ static int stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct
         rc = 0;
         doclocal = 0;
 
-        if (portp->tty->termios->c_cflag & CLOCAL)
+        if (portp->port.tty->termios->c_cflag & CLOCAL)
                 doclocal++;
 
         spin_lock_irqsave(&stli_lock, flags);
@@ -1211,14 +1211,14 @@ static int stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct
                     &portp->asig, sizeof(asysigs_t), 0)) < 0)
                         break;
                 if (tty_hung_up_p(filp) ||
-                    ((portp->flags & ASYNC_INITIALIZED) == 0)) {
-                        if (portp->flags & ASYNC_HUP_NOTIFY)
+                    ((portp->port.flags & ASYNC_INITIALIZED) == 0)) {
+                        if (portp->port.flags & ASYNC_HUP_NOTIFY)
                                 rc = -EBUSY;
                         else
                                 rc = -ERESTARTSYS;
                         break;
                 }
-                if (((portp->flags & ASYNC_CLOSING) == 0) &&
+                if (((portp->port.flags & ASYNC_CLOSING) == 0) &&
                     (doclocal || (portp->sigs & TIOCM_CD))) {
                         break;
                 }
@@ -1226,7 +1226,7 @@ static int stli_waitcarrier(struct stlibrd *brdp, struct stliport *portp, struct
                         rc = -ERESTARTSYS;
                         break;
                 }
-                interruptible_sleep_on(&portp->open_wait);
+                interruptible_sleep_on(&portp->port.open_wait);
         }
 
         spin_lock_irqsave(&stli_lock, flags);
@@ -1548,7 +1548,7 @@ static int stli_getserial(struct stliport *portp, struct serial_struct __user *s
         sio.type = PORT_UNKNOWN;
         sio.line = portp->portnr;
         sio.irq = 0;
-        sio.flags = portp->flags;
+        sio.flags = portp->port.flags;
         sio.baud_base = portp->baud_base;
         sio.close_delay = portp->close_delay;
         sio.closing_wait = portp->closing_wait;
@@ -1583,11 +1583,11 @@ static int stli_setserial(struct stliport *portp, struct serial_struct __user *s
                 if ((sio.baud_base != portp->baud_base) ||
                     (sio.close_delay != portp->close_delay) ||
                     ((sio.flags & ~ASYNC_USR_MASK) !=
-                    (portp->flags & ~ASYNC_USR_MASK)))
+                    (portp->port.flags & ~ASYNC_USR_MASK)))
                         return -EPERM;
         } 
 
-        portp->flags = (portp->flags & ~ASYNC_USR_MASK) |
+        portp->port.flags = (portp->port.flags & ~ASYNC_USR_MASK) |
                 (sio.flags & ASYNC_USR_MASK);
         portp->baud_base = sio.baud_base;
         portp->close_delay = sio.close_delay;
@@ -1751,7 +1751,7 @@ static void stli_settermios(struct tty_struct *tty, struct ktermios *old)
         if ((old->c_cflag & CRTSCTS) && ((tiosp->c_cflag & CRTSCTS) == 0))
                 tty->hw_stopped = 0;
         if (((old->c_cflag & CLOCAL) == 0) && (tiosp->c_cflag & CLOCAL))
-                wake_up_interruptible(&portp->open_wait);
+                wake_up_interruptible(&portp->port.open_wait);
 }
 
 /*****************************************************************************/
@@ -1834,7 +1834,7 @@ static void stli_hangup(struct tty_struct *tty)
         if (brdp == NULL)
                 return;
 
-        portp->flags &= ~ASYNC_INITIALIZED;
+        portp->port.flags &= ~ASYNC_INITIALIZED;
 
         if (!test_bit(ST_CLOSING, &portp->state))
                 stli_rawclose(brdp, portp, 0, 0);
@@ -1855,12 +1855,12 @@ static void stli_hangup(struct tty_struct *tty)
         clear_bit(ST_TXBUSY, &portp->state);
         clear_bit(ST_RXSTOP, &portp->state);
         set_bit(TTY_IO_ERROR, &tty->flags);
-        portp->tty = NULL;
-        portp->flags &= ~ASYNC_NORMAL_ACTIVE;
+        portp->port.tty = NULL;
+        portp->port.flags &= ~ASYNC_NORMAL_ACTIVE;
         portp->refcount = 0;
         spin_unlock_irqrestore(&stli_lock, flags);
 
-        wake_up_interruptible(&portp->open_wait);
+        wake_up_interruptible(&portp->port.open_wait);
 }
 
 /*****************************************************************************/
@@ -2188,7 +2188,7 @@ static void stli_read(struct stlibrd *brdp, struct stliport *portp)
 
         if (test_bit(ST_RXSTOP, &portp->state))
                 return;
-        tty = portp->tty;
+        tty = portp->port.tty;
         if (tty == NULL)
                 return;
 
@@ -2362,7 +2362,7 @@ static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp)
         if (ap->notify) {
                 nt = ap->changed;
                 ap->notify = 0;
-                tty = portp->tty;
+                tty = portp->port.tty;
 
                 if (nt.signal & SG_DCD) {
                         oldsigs = portp->sigs;
@@ -2370,10 +2370,10 @@ static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp)
                         clear_bit(ST_GETSIGS, &portp->state);
                         if ((portp->sigs & TIOCM_CD) &&
                             ((oldsigs & TIOCM_CD) == 0))
-                                wake_up_interruptible(&portp->open_wait);
+                                wake_up_interruptible(&portp->port.open_wait);
                         if ((oldsigs & TIOCM_CD) &&
                             ((portp->sigs & TIOCM_CD) == 0)) {
-                                if (portp->flags & ASYNC_CHECK_CD) {
+                                if (portp->port.flags & ASYNC_CHECK_CD) {
                                         if (tty)
                                                 tty_hangup(tty);
                                 }
@@ -2392,7 +2392,7 @@ static int stli_hostcmd(struct stlibrd *brdp, struct stliport *portp)
                 if ((nt.data & DT_RXBREAK) && (portp->rxmarkmsk & BRKINT)) {
                         if (tty != NULL) {
                                 tty_insert_flip_char(tty, 0, TTY_BREAK);
-                                if (portp->flags & ASYNC_SAK) {
+                                if (portp->port.flags & ASYNC_SAK) {
                                         do_SAK(tty);
                                         EBRDENABLE(brdp);
                                 }
@@ -2542,17 +2542,17 @@ static void stli_mkasyport(struct stliport *portp, asyport_t *pp, struct ktermio
 /*
  *      Start of by setting the baud, char size, parity and stop bit info.
  */
-        pp->baudout = tty_get_baud_rate(portp->tty);
+        pp->baudout = tty_get_baud_rate(portp->port.tty);
         if ((tiosp->c_cflag & CBAUD) == B38400) {
-                if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
                         pp->baudout = 57600;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
                         pp->baudout = 115200;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
                         pp->baudout = 230400;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
                         pp->baudout = 460800;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
                         pp->baudout = (portp->baud_base / portp->custom_divisor);
         }
         if (pp->baudout > STL_MAXBAUD)
@@ -2625,9 +2625,9 @@ static void stli_mkasyport(struct stliport *portp, asyport_t *pp, struct ktermio
  *      Set up clocal processing as required.
  */
         if (tiosp->c_cflag & CLOCAL)
-                portp->flags &= ~ASYNC_CHECK_CD;
+                portp->port.flags &= ~ASYNC_CHECK_CD;
         else
-                portp->flags |= ASYNC_CHECK_CD;
+                portp->port.flags |= ASYNC_CHECK_CD;
 
 /*
  *      Transfer any persistent flags into the asyport structure.
@@ -2703,8 +2703,8 @@ static int stli_initports(struct stlibrd *brdp)
                 portp->baud_base = STL_BAUDBASE;
                 portp->close_delay = STL_CLOSEDELAY;
                 portp->closing_wait = 30 * HZ;
-                init_waitqueue_head(&portp->open_wait);
-                init_waitqueue_head(&portp->close_wait);
+                init_waitqueue_head(&portp->port.open_wait);
+                init_waitqueue_head(&portp->port.close_wait);
                 init_waitqueue_head(&portp->raw_wait);
                 panelport++;
                 if (panelport >= brdp->panels[panelnr]) {
@@ -4246,18 +4246,18 @@ static int stli_portcmdstats(struct stliport *portp)
         stli_comstats.panel = portp->panelnr;
         stli_comstats.port = portp->portnr;
         stli_comstats.state = portp->state;
-        stli_comstats.flags = portp->flags;
+        stli_comstats.flags = portp->port.flag;
 
         spin_lock_irqsave(&brd_lock, flags);
-        if (portp->tty != NULL) {
-                if (portp->tty->driver_data == portp) {
-                        stli_comstats.ttystate = portp->tty->flags;
+        if (portp->port.tty != NULL) {
+                if (portp->port.tty->driver_data == portp) {
+                        stli_comstats.ttystate = portp->port.tty->flags;
                         stli_comstats.rxbuffered = -1;
-                        if (portp->tty->termios != NULL) {
-                                stli_comstats.cflags = portp->tty->termios->c_cflag;
-                                stli_comstats.iflags = portp->tty->termios->c_iflag;
-                                stli_comstats.oflags = portp->tty->termios->c_oflag;
-                                stli_comstats.lflags = portp->tty->termios->c_lflag;
+                        if (portp->port.tty->termios != NULL) {
+                                stli_comstats.cflags = portp->port.tty->termios->c_cflag;
+                                stli_comstats.iflags = portp->port.tty->termios->c_iflag;
+                                stli_comstats.oflags = portp->port.tty->termios->c_oflag;
+                                stli_comstats.lflags = portp->port.tty->termios->c_lflag;
                         }
                 }
         }
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index e21346da3101..2bba250ffc8e 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -130,17 +130,13 @@ struct moxaq_str {
 };
 
 struct moxa_port {
+        struct tty_port port;
         struct moxa_board_conf *board;
-        struct tty_struct *tty;
         void __iomem *tableAddr;
 
         int type;
-        int close_delay;
-        unsigned int count;
-        int asyncflags;
         int cflag;
         unsigned long statusflags;
-        wait_queue_head_t open_wait;
 
         u8 DCDState;
         u8 lineCtrl;
@@ -348,10 +344,10 @@ static int moxa_ioctl(struct tty_struct *tty, struct file *file,
                                 if (status & 4)
                                         tmp.dcd = 1;
 
-                                if (!p->tty || !p->tty->termios)
+                                if (!p->port.tty || !p->port.tty->termios)
                                         tmp.cflag = p->cflag;
                                 else
-                                        tmp.cflag = p->tty->termios->c_cflag;
+                                        tmp.cflag = p->port.tty->termios->c_cflag;
 copy:
                                 if (copy_to_user(argm, &tmp, sizeof(tmp))) {
                                         mutex_unlock(&moxa_openlock);
@@ -825,10 +821,9 @@ static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev)
         }
 
         for (i = 0, p = brd->ports; i < MAX_PORTS_PER_BOARD; i++, p++) {
+                tty_port_init(&p->port);
                 p->type = PORT_16550A;
-                p->close_delay = 5 * HZ / 10;
                 p->cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;
-                init_waitqueue_head(&p->open_wait);
         }
 
         switch (brd->boardType) {
@@ -884,12 +879,12 @@ static void moxa_board_deinit(struct moxa_board_conf *brd)
 
         /* pci hot-un-plug support */
         for (a = 0; a < brd->numPorts; a++)
-                if (brd->ports[a].asyncflags & ASYNC_INITIALIZED)
-                        tty_hangup(brd->ports[a].tty);
+                if (brd->ports[a].port.flags & ASYNC_INITIALIZED)
+                        tty_hangup(brd->ports[a].port.tty);
         while (1) {
                 opened = 0;
                 for (a = 0; a < brd->numPorts; a++)
-                        if (brd->ports[a].asyncflags & ASYNC_INITIALIZED)
+                        if (brd->ports[a].port.flags & ASYNC_INITIALIZED)
                                 opened++;
                 mutex_unlock(&moxa_openlock);
                 if (!opened)
@@ -1104,9 +1099,9 @@ static void moxa_close_port(struct moxa_port *ch)
 {
         moxa_shut_down(ch);
         MoxaPortFlushData(ch, 2);
-        ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE;
-        ch->tty->driver_data = NULL;
-        ch->tty = NULL;
+        ch->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        ch->port.tty->driver_data = NULL;
+        ch->port.tty = NULL;
 }
 
 static int moxa_block_till_ready(struct tty_struct *tty, struct file *filp,
@@ -1117,7 +1112,7 @@ static int moxa_block_till_ready(struct tty_struct *tty, struct file *filp,
         u8 dcd;
 
         while (1) {
-                prepare_to_wait(&ch->open_wait, &wait, TASK_INTERRUPTIBLE);
+                prepare_to_wait(&ch->port.open_wait, &wait, TASK_INTERRUPTIBLE);
                 if (tty_hung_up_p(filp)) {
 #ifdef SERIAL_DO_RESTART
                         retval = -ERESTARTSYS;
@@ -1138,7 +1133,7 @@ static int moxa_block_till_ready(struct tty_struct *tty, struct file *filp,
                 }
                 schedule();
         }
-        finish_wait(&ch->open_wait, &wait);
+        finish_wait(&ch->port.open_wait, &wait);
 
         return retval;
 }
@@ -1163,16 +1158,16 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
         }
 
         ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
-        ch->count++;
+        ch->port.count++;
         tty->driver_data = ch;
-        ch->tty = tty;
-        if (!(ch->asyncflags & ASYNC_INITIALIZED)) {
+        ch->port.tty = tty;
+        if (!(ch->port.flags & ASYNC_INITIALIZED)) {
                 ch->statusflags = 0;
                 moxa_set_tty_param(tty, tty->termios);
                 MoxaPortLineCtrl(ch, 1, 1);
                 MoxaPortEnable(ch);
                 MoxaSetFifo(ch, ch->type == PORT_16550A);
-                ch->asyncflags |= ASYNC_INITIALIZED;
+                ch->port.flags |= ASYNC_INITIALIZED;
         }
         mutex_unlock(&moxa_openlock);
 
@@ -1181,11 +1176,11 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
                 retval = moxa_block_till_ready(tty, filp, ch);
         mutex_lock(&moxa_openlock);
         if (retval) {
-                if (ch->count) /* 0 means already hung up... */
-                        if (--ch->count == 0)
+                if (ch->port.count) /* 0 means already hung up... */
+                        if (--ch->port.count == 0)
                                 moxa_close_port(ch);
         } else
-                ch->asyncflags |= ASYNC_NORMAL_ACTIVE;
+                ch->port.flags |= ASYNC_NORMAL_ACTIVE;
         mutex_unlock(&moxa_openlock);
 
         return retval;
@@ -1204,21 +1199,21 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
         ch = tty->driver_data;
         if (ch == NULL)
                 goto unlock;
-        if (tty->count == 1 && ch->count != 1) {
+        if (tty->count == 1 && ch->port.count != 1) {
                 printk(KERN_WARNING "moxa_close: bad serial port count; "
-                        "tty->count is 1, ch->count is %d\n", ch->count);
-                ch->count = 1;
+                        "tty->count is 1, ch->port.count is %d\n", ch->port.count);
+                ch->port.count = 1;
         }
-        if (--ch->count < 0) {
+        if (--ch->port.count < 0) {
                 printk(KERN_WARNING "moxa_close: bad serial port count, "
                         "device=%s\n", tty->name);
-                ch->count = 0;
+                ch->port.count = 0;
         }
-        if (ch->count)
+        if (ch->port.count)
                 goto unlock;
 
         ch->cflag = tty->termios->c_cflag;
-        if (ch->asyncflags & ASYNC_INITIALIZED) {
+        if (ch->port.flags & ASYNC_INITIALIZED) {
                 moxa_setup_empty_event(tty);
                 tty_wait_until_sent(tty, 30 * HZ);      /* 30 seconds timeout */
         }
@@ -1374,7 +1369,7 @@ static void moxa_set_termios(struct tty_struct *tty,
                 return;
         moxa_set_tty_param(tty, old_termios);
         if (!(old_termios->c_cflag & CLOCAL) && C_CLOCAL(tty))
-                wake_up_interruptible(&ch->open_wait);
+                wake_up_interruptible(&ch->port.open_wait);
 }
 
 static void moxa_stop(struct tty_struct *tty)
@@ -1412,20 +1407,20 @@ static void moxa_hangup(struct tty_struct *tty)
                 mutex_unlock(&moxa_openlock);
                 return;
         }
-        ch->count = 0;
+        ch->port.count = 0;
         moxa_close_port(ch);
         mutex_unlock(&moxa_openlock);
 
-        wake_up_interruptible(&ch->open_wait);
+        wake_up_interruptible(&ch->port.open_wait);
 }
 
 static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
 {
         dcd = !!dcd;
 
-        if (dcd != p->DCDState && p->tty && C_CLOCAL(p->tty)) {
+        if (dcd != p->DCDState && p->port.tty && C_CLOCAL(p->port.tty)) {
                 if (!dcd)
-                        tty_hangup(p->tty);
+                        tty_hangup(p->port.tty);
         }
         p->DCDState = dcd;
 }
@@ -1433,9 +1428,9 @@ static void moxa_new_dcdstate(struct moxa_port *p, u8 dcd)
 static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
                 u16 __iomem *ip)
 {
-        struct tty_struct *tty = p->tty;
+        struct tty_struct *tty = p->port.tty;
         void __iomem *ofsAddr;
-        unsigned int inited = p->asyncflags & ASYNC_INITIALIZED;
+        unsigned int inited = p->port.flags & ASYNC_INITIALIZED;
         u16 intr;
 
         if (tty) {
@@ -1566,9 +1561,9 @@ static void moxa_setup_empty_event(struct tty_struct *tty)
 
 static void moxa_shut_down(struct moxa_port *ch)
 {
-        struct tty_struct *tp = ch->tty;
+        struct tty_struct *tp = ch->port.tty;
 
-        if (!(ch->asyncflags & ASYNC_INITIALIZED))
+        if (!(ch->port.flags & ASYNC_INITIALIZED))
                 return;
 
         MoxaPortDisable(ch);
@@ -1580,7 +1575,7 @@ static void moxa_shut_down(struct moxa_port *ch)
                 MoxaPortLineCtrl(ch, 0, 0);
 
         spin_lock_bh(&moxa_lock);
-        ch->asyncflags &= ~ASYNC_INITIALIZED;
+        ch->port.flags &= ~ASYNC_INITIALIZED;
         spin_unlock_bh(&moxa_lock);
 }
 
@@ -1975,7 +1970,7 @@ static int MoxaPortWriteData(struct moxa_port *port,
         c = (head > tail) ? (head - tail - 1) : (head - tail + tx_mask);
         if (c > len)
                 c = len;
-        moxaLog.txcnt[port->tty->index] += c;
+        moxaLog.txcnt[port->port.tty->index] += c;
         total = c;
         if (spage == epage) {
                 bufhead = readw(ofsAddr + Ofs_txb);
@@ -2017,7 +2012,7 @@ static int MoxaPortWriteData(struct moxa_port *port,
 
 static int MoxaPortReadData(struct moxa_port *port)
 {
-        struct tty_struct *tty = port->tty;
+        struct tty_struct *tty = port->port.tty;
         unsigned char *dst;
         void __iomem *baseAddr, *ofsAddr, *ofs;
         unsigned int count, len, total;
@@ -2124,10 +2119,10 @@ static int moxa_get_serial_info(struct moxa_port *info,
 {
         struct serial_struct tmp = {
                 .type = info->type,
-                .line = info->tty->index,
-                .flags = info->asyncflags,
+                .line = info->port.tty->index,
+                .flags = info->port.flags,
                 .baud_base = 921600,
-                .close_delay = info->close_delay
+                .close_delay = info->port.close_delay
         };
         return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
 }
@@ -2148,13 +2143,13 @@ static int moxa_set_serial_info(struct moxa_port *info,
 
         if (!capable(CAP_SYS_ADMIN)) {
                 if (((new_serial.flags & ~ASYNC_USR_MASK) !=
-                     (info->asyncflags & ~ASYNC_USR_MASK)))
+                     (info->port.flags & ~ASYNC_USR_MASK)))
                         return -EPERM;
         } else
-                info->close_delay = new_serial.close_delay * HZ / 100;
+                info->port.close_delay = new_serial.close_delay * HZ / 100;
 
         new_serial.flags = (new_serial.flags & ~ASYNC_FLAGS);
-        new_serial.flags |= (info->asyncflags & ASYNC_FLAGS);
+        new_serial.flags |= (info->port.flags & ASYNC_FLAGS);
 
         MoxaSetFifo(info, new_serial.type == PORT_16550A);
 
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 4b81a85c5b53..6307e301bd26 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -222,8 +222,8 @@ struct mxser_mon_ext {
 struct mxser_board;
 
 struct mxser_port {
+        struct tty_port port;
         struct mxser_board *board;
-        struct tty_struct *tty;
 
         unsigned long ioaddr;
         unsigned long opmode_ioaddr;
@@ -234,7 +234,6 @@ struct mxser_port {
         int rx_low_water;
         int baud_base;          /* max. speed */
         int type;               /* UART type */
-        int flags;              /* defined in tty.h */
 
         int x_char;             /* xon/xoff character */
         int IER;                /* Interrupt Enable Register */
@@ -244,20 +243,14 @@ struct mxser_port {
         unsigned char ldisc_stop_rx;
 
         int custom_divisor;
-        int close_delay;
-        unsigned short closing_wait;
         unsigned char err_shadow;
-        unsigned long event;
 
-        int count;              /* # of fd on device */
-        int blocked_open;       /* # of blocked opens */
         struct async_icount icount; /* kernel counters for 4 input interrupts */
         int timeout;
 
         int read_status_mask;
         int ignore_status_mask;
         int xmit_fifo_size;
-        unsigned char *xmit_buf;
         int xmit_head;
         int xmit_tail;
         int xmit_cnt;
@@ -267,7 +260,6 @@ struct mxser_port {
         struct mxser_mon mon_data;
 
         spinlock_t slock;
-        wait_queue_head_t open_wait;
         wait_queue_head_t delta_msr_wait;
 };
 
@@ -575,7 +567,7 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp,
          */
         if ((filp->f_flags & O_NONBLOCK) ||
                         test_bit(TTY_IO_ERROR, &tty->flags)) {
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+                port->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
 
@@ -585,32 +577,32 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp,
         /*
          * Block waiting for the carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
-         * this loop, port->count is dropped by one, so that
+         * this loop, port->port.count is dropped by one, so that
          * mxser_close() knows when to free things.  We restore it upon
          * exit, either normal or abnormal.
          */
         retval = 0;
-        add_wait_queue(&port->open_wait, &wait);
+        add_wait_queue(&port->port.open_wait, &wait);
 
         spin_lock_irqsave(&port->slock, flags);
         if (!tty_hung_up_p(filp))
-                port->count--;
+                port->port.count--;
         spin_unlock_irqrestore(&port->slock, flags);
-        port->blocked_open++;
+        port->port.blocked_open++;
         while (1) {
                 spin_lock_irqsave(&port->slock, flags);
                 outb(inb(port->ioaddr + UART_MCR) |
                         UART_MCR_DTR | UART_MCR_RTS, port->ioaddr + UART_MCR);
                 spin_unlock_irqrestore(&port->slock, flags);
                 set_current_state(TASK_INTERRUPTIBLE);
-                if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)) {
-                        if (port->flags & ASYNC_HUP_NOTIFY)
+                if (tty_hung_up_p(filp) || !(port->port.flags & ASYNC_INITIALIZED)) {
+                        if (port->port.flags & ASYNC_HUP_NOTIFY)
                                 retval = -EAGAIN;
                         else
                                 retval = -ERESTARTSYS;
                         break;
                 }
-                if (!(port->flags & ASYNC_CLOSING) &&
+                if (!(port->port.flags & ASYNC_CLOSING) &&
                                 (do_clocal ||
                                 (inb(port->ioaddr + UART_MSR) & UART_MSR_DCD)))
                         break;
@@ -621,13 +613,13 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp,
                 schedule();
         }
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
+        remove_wait_queue(&port->port.open_wait, &wait);
         if (!tty_hung_up_p(filp))
-                port->count++;
-        port->blocked_open--;
+                port->port.count++;
+        port->port.blocked_open--;
         if (retval)
                 return retval;
-        port->flags |= ASYNC_NORMAL_ACTIVE;
+        port->port.flags |= ASYNC_NORMAL_ACTIVE;
         return 0;
 }
 
@@ -636,7 +628,7 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)
         int quot = 0, baud;
         unsigned char cval;
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return -1;
 
         if (!(info->ioaddr))
@@ -647,13 +639,13 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)
 
         if (newspd == 134) {
                 quot = 2 * info->baud_base / 269;
-                tty_encode_baud_rate(info->tty, 134, 134);
+                tty_encode_baud_rate(info->port.tty, 134, 134);
         } else if (newspd) {
                 quot = info->baud_base / newspd;
                 if (quot == 0)
                         quot = 1;
                 baud = info->baud_base/quot;
-                tty_encode_baud_rate(info->tty, baud, baud);
+                tty_encode_baud_rate(info->port.tty, baud, baud);
         } else {
                 quot = 0;
         }
@@ -679,7 +671,7 @@ static int mxser_set_baud(struct mxser_port *info, long newspd)
         outb(cval, info->ioaddr + UART_LCR);    /* reset DLAB */
 
 #ifdef BOTHER
-        if (C_BAUD(info->tty) == BOTHER) {
+        if (C_BAUD(info->port.tty) == BOTHER) {
                 quot = info->baud_base % newspd;
                 quot *= 8;
                 if (quot % newspd > newspd / 2) {
@@ -707,14 +699,14 @@ static int mxser_change_speed(struct mxser_port *info,
         int ret = 0;
         unsigned char status;
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return ret;
-        cflag = info->tty->termios->c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
         if (!(info->ioaddr))
                 return ret;
 
-        if (mxser_set_baud_method[info->tty->index] == 0)
-                mxser_set_baud(info, tty_get_baud_rate(info->tty));
+        if (mxser_set_baud_method[info->port.tty->index] == 0)
+                mxser_set_baud(info, tty_get_baud_rate(info->port.tty));
 
         /* byte size and parity */
         switch (cflag & CSIZE) {
@@ -777,15 +769,15 @@ static int mxser_change_speed(struct mxser_port *info,
         info->IER &= ~UART_IER_MSI;
         info->MCR &= ~UART_MCR_AFE;
         if (cflag & CRTSCTS) {
-                info->flags |= ASYNC_CTS_FLOW;
+                info->port.flags |= ASYNC_CTS_FLOW;
                 info->IER |= UART_IER_MSI;
                 if ((info->type == PORT_16550A) || (info->board->chip_flag)) {
                         info->MCR |= UART_MCR_AFE;
                 } else {
                         status = inb(info->ioaddr + UART_MSR);
-                        if (info->tty->hw_stopped) {
+                        if (info->port.tty->hw_stopped) {
                                 if (status & UART_MSR_CTS) {
-                                        info->tty->hw_stopped = 0;
+                                        info->port.tty->hw_stopped = 0;
                                         if (info->type != PORT_16550A &&
                                                         !info->board->chip_flag) {
                                                 outb(info->IER & ~UART_IER_THRI,
@@ -795,11 +787,11 @@ static int mxser_change_speed(struct mxser_port *info,
                                                 outb(info->IER, info->ioaddr +
                                                                 UART_IER);
                                         }
-                                        tty_wakeup(info->tty);
+                                        tty_wakeup(info->port.tty);
                                 }
                         } else {
                                 if (!(status & UART_MSR_CTS)) {
-                                        info->tty->hw_stopped = 1;
+                                        info->port.tty->hw_stopped = 1;
                                         if ((info->type != PORT_16550A) &&
                                                         (!info->board->chip_flag)) {
                                                 info->IER &= ~UART_IER_THRI;
@@ -810,13 +802,13 @@ static int mxser_change_speed(struct mxser_port *info,
                         }
                 }
         } else {
-                info->flags &= ~ASYNC_CTS_FLOW;
+                info->port.flags &= ~ASYNC_CTS_FLOW;
         }
         outb(info->MCR, info->ioaddr + UART_MCR);
         if (cflag & CLOCAL) {
-                info->flags &= ~ASYNC_CHECK_CD;
+                info->port.flags &= ~ASYNC_CHECK_CD;
         } else {
-                info->flags |= ASYNC_CHECK_CD;
+                info->port.flags |= ASYNC_CHECK_CD;
                 info->IER |= UART_IER_MSI;
         }
         outb(info->IER, info->ioaddr + UART_IER);
@@ -825,21 +817,21 @@ static int mxser_change_speed(struct mxser_port *info,
          * Set up parity check flag
          */
         info->read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
-        if (I_INPCK(info->tty))
+        if (I_INPCK(info->port.tty))
                 info->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
+        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
                 info->read_status_mask |= UART_LSR_BI;
 
         info->ignore_status_mask = 0;
 
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(info->port.tty)) {
                 info->ignore_status_mask |= UART_LSR_BI;
                 info->read_status_mask |= UART_LSR_BI;
                 /*
                  * If we're ignore parity and break indicators, ignore
                  * overruns too.  (For real raw support).
                  */
-                if (I_IGNPAR(info->tty)) {
+                if (I_IGNPAR(info->port.tty)) {
                         info->ignore_status_mask |=
                                                 UART_LSR_OE |
                                                 UART_LSR_PE |
@@ -851,16 +843,16 @@ static int mxser_change_speed(struct mxser_port *info,
                 }
         }
         if (info->board->chip_flag) {
-                mxser_set_must_xon1_value(info->ioaddr, START_CHAR(info->tty));
-                mxser_set_must_xoff1_value(info->ioaddr, STOP_CHAR(info->tty));
-                if (I_IXON(info->tty)) {
+                mxser_set_must_xon1_value(info->ioaddr, START_CHAR(info->port.tty));
+                mxser_set_must_xoff1_value(info->ioaddr, STOP_CHAR(info->port.tty));
+                if (I_IXON(info->port.tty)) {
                         mxser_enable_must_rx_software_flow_control(
                                         info->ioaddr);
                 } else {
                         mxser_disable_must_rx_software_flow_control(
                                         info->ioaddr);
                 }
-                if (I_IXOFF(info->tty)) {
+                if (I_IXOFF(info->port.tty)) {
                         mxser_enable_must_tx_software_flow_control(
                                         info->ioaddr);
                 } else {
@@ -890,15 +882,15 @@ static void mxser_check_modem_status(struct mxser_port *port, int status)
         port->mon_data.modem_status = status;
         wake_up_interruptible(&port->delta_msr_wait);
 
-        if ((port->flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
+        if ((port->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
                 if (status & UART_MSR_DCD)
-                        wake_up_interruptible(&port->open_wait);
+                        wake_up_interruptible(&port->port.open_wait);
         }
 
-        if (port->flags & ASYNC_CTS_FLOW) {
-                if (port->tty->hw_stopped) {
+        if (port->port.flags & ASYNC_CTS_FLOW) {
+                if (port->port.tty->hw_stopped) {
                         if (status & UART_MSR_CTS) {
-                                port->tty->hw_stopped = 0;
+                                port->port.tty->hw_stopped = 0;
 
                                 if ((port->type != PORT_16550A) &&
                                                 (!port->board->chip_flag)) {
@@ -908,11 +900,11 @@ static void mxser_check_modem_status(struct mxser_port *port, int status)
                                         outb(port->IER, port->ioaddr +
                                                         UART_IER);
                                 }
-                                tty_wakeup(port->tty);
+                                tty_wakeup(port->port.tty);
                         }
                 } else {
                         if (!(status & UART_MSR_CTS)) {
-                                port->tty->hw_stopped = 1;
+                                port->port.tty->hw_stopped = 1;
                                 if (port->type != PORT_16550A &&
                                                 !port->board->chip_flag) {
                                         port->IER &= ~UART_IER_THRI;
@@ -935,23 +927,23 @@ static int mxser_startup(struct mxser_port *info)
 
         spin_lock_irqsave(&info->slock, flags);
 
-        if (info->flags & ASYNC_INITIALIZED) {
+        if (info->port.flags & ASYNC_INITIALIZED) {
                 free_page(page);
                 spin_unlock_irqrestore(&info->slock, flags);
                 return 0;
         }
 
         if (!info->ioaddr || !info->type) {
-                if (info->tty)
-                        set_bit(TTY_IO_ERROR, &info->tty->flags);
+                if (info->port.tty)
+                        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
                 free_page(page);
                 spin_unlock_irqrestore(&info->slock, flags);
                 return 0;
         }
-        if (info->xmit_buf)
+        if (info->port.xmit_buf)
                 free_page(page);
         else
-                info->xmit_buf = (unsigned char *) page;
+                info->port.xmit_buf = (unsigned char *) page;
 
         /*
          * Clear the FIFO buffers and disable them
@@ -973,8 +965,8 @@ static int mxser_startup(struct mxser_port *info)
         if (inb(info->ioaddr + UART_LSR) == 0xff) {
                 spin_unlock_irqrestore(&info->slock, flags);
                 if (capable(CAP_SYS_ADMIN)) {
-                        if (info->tty)
-                                set_bit(TTY_IO_ERROR, &info->tty->flags);
+                        if (info->port.tty)
+                                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
                         return 0;
                 } else
                         return -ENODEV;
@@ -1012,15 +1004,15 @@ static int mxser_startup(struct mxser_port *info)
         (void) inb(info->ioaddr + UART_IIR);
         (void) inb(info->ioaddr + UART_MSR);
 
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
 
         /*
          * and set the speed of the serial port
          */
         mxser_change_speed(info, NULL);
-        info->flags |= ASYNC_INITIALIZED;
+        info->port.flags |= ASYNC_INITIALIZED;
         spin_unlock_irqrestore(&info->slock, flags);
 
         return 0;
@@ -1034,7 +1026,7 @@ static void mxser_shutdown(struct mxser_port *info)
 {
         unsigned long flags;
 
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 return;
 
         spin_lock_irqsave(&info->slock, flags);
@@ -1048,15 +1040,15 @@ static void mxser_shutdown(struct mxser_port *info)
         /*
          * Free the IRQ, if necessary
          */
-        if (info->xmit_buf) {
-                free_page((unsigned long) info->xmit_buf);
-                info->xmit_buf = NULL;
+        if (info->port.xmit_buf) {
+                free_page((unsigned long) info->port.xmit_buf);
+                info->port.xmit_buf = NULL;
         }
 
         info->IER = 0;
         outb(0x00, info->ioaddr + UART_IER);
 
-        if (!info->tty || (info->tty->termios->c_cflag & HUPCL))
+        if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL))
                 info->MCR &= ~(UART_MCR_DTR | UART_MCR_RTS);
         outb(info->MCR, info->ioaddr + UART_MCR);
 
@@ -1072,10 +1064,10 @@ static void mxser_shutdown(struct mxser_port *info)
         /* read data port to reset things */
         (void) inb(info->ioaddr + UART_RX);
 
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-        info->flags &= ~ASYNC_INITIALIZED;
+        info->port.flags &= ~ASYNC_INITIALIZED;
 
         if (info->board->chip_flag)
                 SET_MOXA_MUST_NO_SOFTWARE_FLOW_CONTROL(info->ioaddr);
@@ -1105,12 +1097,12 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
                 return -ENODEV;
 
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
         /*
          * Start up serial port
          */
         spin_lock_irqsave(&info->slock, flags);
-        info->count++;
+        info->port.count++;
         spin_unlock_irqrestore(&info->slock, flags);
         retval = mxser_startup(info);
         if (retval)
@@ -1170,42 +1162,42 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
                 spin_unlock_irqrestore(&info->slock, flags);
                 return;
         }
-        if ((tty->count == 1) && (info->count != 1)) {
+        if ((tty->count == 1) && (info->port.count != 1)) {
                 /*
                  * Uh, oh.  tty->count is 1, which means that the tty
-                 * structure will be freed.  Info->count should always
+                 * structure will be freed.  Info->port.count should always
                  * be one in these conditions.  If it's greater than
                  * one, we've got real problems, since it means the
                  * serial port won't be shutdown.
                  */
                 printk(KERN_ERR "mxser_close: bad serial port count; "
-                        "tty->count is 1, info->count is %d\n", info->count);
-                info->count = 1;
+                        "tty->count is 1, info->port.count is %d\n", info->port.count);
+                info->port.count = 1;
         }
-        if (--info->count < 0) {
+        if (--info->port.count < 0) {
                 printk(KERN_ERR "mxser_close: bad serial port count for "
-                        "ttys%d: %d\n", tty->index, info->count);
-                info->count = 0;
+                        "ttys%d: %d\n", tty->index, info->port.count);
+                info->port.count = 0;
         }
-        if (info->count) {
+        if (info->port.count) {
                 spin_unlock_irqrestore(&info->slock, flags);
                 return;
         }
-        info->flags |= ASYNC_CLOSING;
+        info->port.flags |= ASYNC_CLOSING;
         spin_unlock_irqrestore(&info->slock, flags);
         /*
          * Save the termios structure, since this port may have
          * separate termios for callout and dialin.
          */
-        if (info->flags & ASYNC_NORMAL_ACTIVE)
+        if (info->port.flags & ASYNC_NORMAL_ACTIVE)
                 info->normal_termios = *tty->termios;
         /*
          * Now we wait for the transmit buffer to clear; and we notify
          * the line discipline to only process XON/XOFF characters.
          */
         tty->closing = 1;
-        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, info->closing_wait);
+        if (info->port.closing_wait != ASYNC_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, info->port.closing_wait);
         /*
          * At this point we stop accepting input.  To do this, we
          * disable the receive line status interrupts, and tell the
@@ -1216,7 +1208,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
         if (info->board->chip_flag)
                 info->IER &= ~MOXA_MUST_RECV_ISR;
 
-        if (info->flags & ASYNC_INITIALIZED) {
+        if (info->port.flags & ASYNC_INITIALIZED) {
                 outb(info->IER, info->ioaddr + UART_IER);
                 /*
                  * Before we drop DTR, make sure the UART transmitter
@@ -1236,15 +1228,14 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
         tty_ldisc_flush(tty);
 
         tty->closing = 0;
-        info->event = 0;
-        info->tty = NULL;
-        if (info->blocked_open) {
-                if (info->close_delay)
-                        schedule_timeout_interruptible(info->close_delay);
-                wake_up_interruptible(&info->open_wait);
+        info->port.tty = NULL;
+        if (info->port.blocked_open) {
+                if (info->port.close_delay)
+                        schedule_timeout_interruptible(info->port.close_delay);
+                wake_up_interruptible(&info->port.open_wait);
         }
 
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
+        info->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
 }
 
 static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int count)
@@ -1253,7 +1244,7 @@ static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int cou
         struct mxser_port *info = tty->driver_data;
         unsigned long flags;
 
-        if (!info->xmit_buf)
+        if (!info->port.xmit_buf)
                 return 0;
 
         while (1) {
@@ -1262,7 +1253,7 @@ static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int cou
                 if (c <= 0)
                         break;
 
-                memcpy(info->xmit_buf + info->xmit_head, buf, c);
+                memcpy(info->port.xmit_buf + info->xmit_head, buf, c);
                 spin_lock_irqsave(&info->slock, flags);
                 info->xmit_head = (info->xmit_head + c) &
                                   (SERIAL_XMIT_SIZE - 1);
@@ -1294,14 +1285,14 @@ static int mxser_put_char(struct tty_struct *tty, unsigned char ch)
         struct mxser_port *info = tty->driver_data;
         unsigned long flags;
 
-        if (!info->xmit_buf)
+        if (!info->port.xmit_buf)
                 return 0;
 
         if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1)
                 return 0;
 
         spin_lock_irqsave(&info->slock, flags);
-        info->xmit_buf[info->xmit_head++] = ch;
+        info->port.xmit_buf[info->xmit_head++] = ch;
         info->xmit_head &= SERIAL_XMIT_SIZE - 1;
         info->xmit_cnt++;
         spin_unlock_irqrestore(&info->slock, flags);
@@ -1327,7 +1318,7 @@ static void mxser_flush_chars(struct tty_struct *tty)
 
         if (info->xmit_cnt <= 0 ||
                         tty->stopped ||
-                        !info->xmit_buf ||
+                        !info->port.xmit_buf ||
                         (tty->hw_stopped &&
                          (info->type != PORT_16550A) &&
                          (!info->board->chip_flag)
@@ -1370,13 +1361,13 @@ static int mxser_get_serial_info(struct mxser_port *info,
 {
         struct serial_struct tmp = {
                 .type = info->type,
-                .line = info->tty->index,
+                .line = info->port.tty->index,
                 .port = info->ioaddr,
                 .irq = info->board->irq,
-                .flags = info->flags,
+                .flags = info->port.flags,
                 .baud_base = info->baud_base,
-                .close_delay = info->close_delay,
-                .closing_wait = info->closing_wait,
+                .close_delay = info->port.close_delay,
+                .closing_wait = info->port.closing_wait,
                 .custom_divisor = info->custom_divisor,
                 .hub6 = 0
         };
@@ -1403,33 +1394,33 @@ static int mxser_set_serial_info(struct mxser_port *info,
                         new_serial.port != info->ioaddr)
                 return -EINVAL;
 
-        flags = info->flags & ASYNC_SPD_MASK;
+        flags = info->port.flags & ASYNC_SPD_MASK;
 
         if (!capable(CAP_SYS_ADMIN)) {
                 if ((new_serial.baud_base != info->baud_base) ||
-                                (new_serial.close_delay != info->close_delay) ||
-                                ((new_serial.flags & ~ASYNC_USR_MASK) != (info->flags & ~ASYNC_USR_MASK)))
+                                (new_serial.close_delay != info->port.close_delay) ||
+                                ((new_serial.flags & ~ASYNC_USR_MASK) != (info->port.flags & ~ASYNC_USR_MASK)))
                         return -EPERM;
-                info->flags = ((info->flags & ~ASYNC_USR_MASK) |
+                info->port.flags = ((info->port.flags & ~ASYNC_USR_MASK) |
                                 (new_serial.flags & ASYNC_USR_MASK));
         } else {
                 /*
                  * OK, past this point, all the error checking has been done.
                  * At this point, we start making changes.....
                  */
-                info->flags = ((info->flags & ~ASYNC_FLAGS) |
+                info->port.flags = ((info->port.flags & ~ASYNC_FLAGS) |
                                 (new_serial.flags & ASYNC_FLAGS));
-                info->close_delay = new_serial.close_delay * HZ / 100;
-                info->closing_wait = new_serial.closing_wait * HZ / 100;
-                info->tty->low_latency =
-                                (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-                info->tty->low_latency = 0;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST &&
+                info->port.close_delay = new_serial.close_delay * HZ / 100;
+                info->port.closing_wait = new_serial.closing_wait * HZ / 100;
+                info->port.tty->low_latency =
+                                (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+                info->port.tty->low_latency = 0;
+                if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST &&
                                 (new_serial.baud_base != info->baud_base ||
                                 new_serial.custom_divisor !=
                                 info->custom_divisor)) {
                         baud = new_serial.baud_base / new_serial.custom_divisor;
-                        tty_encode_baud_rate(info->tty, baud, baud);
+                        tty_encode_baud_rate(info->port.tty, baud, baud);
                 }
         }
 
@@ -1437,8 +1428,8 @@ static int mxser_set_serial_info(struct mxser_port *info,
 
         process_txrx_fifo(info);
 
-        if (info->flags & ASYNC_INITIALIZED) {
-                if (flags != (info->flags & ASYNC_SPD_MASK)) {
+        if (info->port.flags & ASYNC_INITIALIZED) {
+                if (flags != (info->port.flags & ASYNC_SPD_MASK)) {
                         spin_lock_irqsave(&info->slock, sl_flags);
                         mxser_change_speed(info, NULL);
                         spin_unlock_irqrestore(&info->slock, sl_flags);
@@ -1693,12 +1684,12 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
                                         continue;
                                 }
 
-                                if (!port->tty || !port->tty->termios)
+                                if (!port->port.tty || !port->port.tty->termios)
                                         GMStatus[i].cflag =
                                                 port->normal_termios.c_cflag;
                                 else
                                         GMStatus[i].cflag =
-                                                port->tty->termios->c_cflag;
+                                                port->port.tty->termios->c_cflag;
 
                                 status = inb(port->ioaddr + UART_MSR);
                                 if (status & 0x80 /*UART_MSR_DCD */ )
@@ -1755,14 +1746,14 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
                                 mon_data_ext.modem_status[i] =
                                         port->mon_data.modem_status;
                                 mon_data_ext.baudrate[i] =
-                                        tty_get_baud_rate(port->tty);
+                                        tty_get_baud_rate(port->port.tty);
 
-                                if (!port->tty || !port->tty->termios) {
+                                if (!port->port.tty || !port->port.tty->termios) {
                                         cflag = port->normal_termios.c_cflag;
                                         iflag = port->normal_termios.c_iflag;
                                 } else {
-                                        cflag = port->tty->termios->c_cflag;
-                                        iflag = port->tty->termios->c_iflag;
+                                        cflag = port->port.tty->termios->c_cflag;
+                                        iflag = port->port.tty->termios->c_iflag;
                                 }
 
                                 mon_data_ext.databits[i] = cflag & CSIZE;
@@ -1989,7 +1980,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
                 else
                         info->mon_data.hold_reason |= NPPI_NOTIFY_XOFFXENT;
 
-                if (info->tty->hw_stopped)
+                if (info->port.tty->hw_stopped)
                         info->mon_data.hold_reason |= NPPI_NOTIFY_CTSHOLD;
                 else
                         info->mon_data.hold_reason &= ~NPPI_NOTIFY_CTSHOLD;
@@ -2038,7 +2029,7 @@ static void mxser_stoprx(struct tty_struct *tty)
                 }
         }
 
-        if (info->tty->termios->c_cflag & CRTSCTS) {
+        if (info->port.tty->termios->c_cflag & CRTSCTS) {
                 info->MCR &= ~UART_MCR_RTS;
                 outb(info->MCR, info->ioaddr + UART_MCR);
         }
@@ -2075,7 +2066,7 @@ static void mxser_unthrottle(struct tty_struct *tty)
                 }
         }
 
-        if (info->tty->termios->c_cflag & CRTSCTS) {
+        if (info->port.tty->termios->c_cflag & CRTSCTS) {
                 info->MCR |= UART_MCR_RTS;
                 outb(info->MCR, info->ioaddr + UART_MCR);
         }
@@ -2106,7 +2097,7 @@ static void mxser_start(struct tty_struct *tty)
         unsigned long flags;
 
         spin_lock_irqsave(&info->slock, flags);
-        if (info->xmit_cnt && info->xmit_buf) {
+        if (info->xmit_cnt && info->port.xmit_buf) {
                 outb(info->IER & ~UART_IER_THRI, info->ioaddr + UART_IER);
                 info->IER |= UART_IER_THRI;
                 outb(info->IER, info->ioaddr + UART_IER);
@@ -2219,11 +2210,10 @@ static void mxser_hangup(struct tty_struct *tty)
 
         mxser_flush_buffer(tty);
         mxser_shutdown(info);
-        info->event = 0;
-        info->count = 0;
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = NULL;
-        wake_up_interruptible(&info->open_wait);
+        info->port.count = 0;
+        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->port.tty = NULL;
+        wake_up_interruptible(&info->port.open_wait);
 }
 
 /*
@@ -2246,7 +2236,7 @@ static void mxser_rs_break(struct tty_struct *tty, int break_state)
 
 static void mxser_receive_chars(struct mxser_port *port, int *status)
 {
-        struct tty_struct *tty = port->tty;
+        struct tty_struct *tty = port->port.tty;
         unsigned char ch, gdl;
         int ignored = 0;
         int cnt = 0;
@@ -2302,7 +2292,7 @@ intr_old:
                                         flag = TTY_BREAK;
                                         port->icount.brk++;
 
-                                        if (port->flags & ASYNC_SAK)
+                                        if (port->port.flags & ASYNC_SAK)
                                                 do_SAK(tty);
                                 } else if (*status & UART_LSR_PE) {
                                         flag = TTY_PARITY;
@@ -2333,7 +2323,7 @@ intr_old:
         } while (*status & UART_LSR_DR);
 
 end_intr:
-        mxvar_log.rxcnt[port->tty->index] += cnt;
+        mxvar_log.rxcnt[port->port.tty->index] += cnt;
         port->mon_data.rxcnt += cnt;
         port->mon_data.up_rxcnt += cnt;
 
@@ -2354,18 +2344,18 @@ static void mxser_transmit_chars(struct mxser_port *port)
         if (port->x_char) {
                 outb(port->x_char, port->ioaddr + UART_TX);
                 port->x_char = 0;
-                mxvar_log.txcnt[port->tty->index]++;
+                mxvar_log.txcnt[port->port.tty->index]++;
                 port->mon_data.txcnt++;
                 port->mon_data.up_txcnt++;
                 port->icount.tx++;
                 return;
         }
 
-        if (port->xmit_buf == NULL)
+        if (port->port.xmit_buf == NULL)
                 return;
 
-        if ((port->xmit_cnt <= 0) || port->tty->stopped ||
-                        (port->tty->hw_stopped &&
+        if ((port->xmit_cnt <= 0) || port->port.tty->stopped ||
+                        (port->port.tty->hw_stopped &&
                         (port->type != PORT_16550A) &&
                         (!port->board->chip_flag))) {
                 port->IER &= ~UART_IER_THRI;
@@ -2376,20 +2366,20 @@ static void mxser_transmit_chars(struct mxser_port *port)
         cnt = port->xmit_cnt;
         count = port->xmit_fifo_size;
         do {
-                outb(port->xmit_buf[port->xmit_tail++],
+                outb(port->port.xmit_buf[port->xmit_tail++],
                         port->ioaddr + UART_TX);
                 port->xmit_tail = port->xmit_tail & (SERIAL_XMIT_SIZE - 1);
                 if (--port->xmit_cnt <= 0)
                         break;
         } while (--count > 0);
-        mxvar_log.txcnt[port->tty->index] += (cnt - port->xmit_cnt);
+        mxvar_log.txcnt[port->port.tty->index] += (cnt - port->xmit_cnt);
 
         port->mon_data.txcnt += (cnt - port->xmit_cnt);
         port->mon_data.up_txcnt += (cnt - port->xmit_cnt);
         port->icount.tx += (cnt - port->xmit_cnt);
 
         if (port->xmit_cnt < WAKEUP_CHARS)
-                tty_wakeup(port->tty);
+                tty_wakeup(port->port.tty);
 
         if (port->xmit_cnt <= 0) {
                 port->IER &= ~UART_IER_THRI;
@@ -2440,9 +2430,9 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)
                                 if (iir & UART_IIR_NO_INT)
                                         break;
                                 iir &= MOXA_MUST_IIR_MASK;
-                                if (!port->tty ||
-                                                (port->flags & ASYNC_CLOSING) ||
-                                                !(port->flags &
+                                if (!port->port.tty ||
+                                                (port->port.flags & ASYNC_CLOSING) ||
+                                                !(port->port.flags &
                                                         ASYNC_INITIALIZED)) {
                                         status = inb(port->ioaddr + UART_LSR);
                                         outb(0x27, port->ioaddr + UART_FCR);
@@ -2550,6 +2540,7 @@ static int __devinit mxser_initbrd(struct mxser_board *brd,
 
         for (i = 0; i < brd->info->nports; i++) {
                 info = &brd->ports[i];
+                tty_port_init(&info->port);
                 info->board = brd;
                 info->stop_rx = 0;
                 info->ldisc_stop_rx = 0;
@@ -2558,16 +2549,15 @@ static int __devinit mxser_initbrd(struct mxser_board *brd,
                 if (brd->chip_flag != MOXA_OTHER_UART)
                         mxser_enable_must_enchance_mode(info->ioaddr);
 
-                info->flags = ASYNC_SHARE_IRQ;
+                info->port.flags = ASYNC_SHARE_IRQ;
                 info->type = brd->uart_type;
 
                 process_txrx_fifo(info);
 
                 info->custom_divisor = info->baud_base * 16;
-                info->close_delay = 5 * HZ / 10;
-                info->closing_wait = 30 * HZ;
+                info->port.close_delay = 5 * HZ / 10;
+                info->port.closing_wait = 30 * HZ;
                 info->normal_termios = mxvar_sdriver->init_termios;
-                init_waitqueue_head(&info->open_wait);
                 init_waitqueue_head(&info->delta_msr_wait);
                 memset(&info->mon_data, 0, sizeof(struct mxser_mon));
                 info->err_shadow = 0;
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index a35bfd7ee80e..ed4e03333ab4 100644
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -199,7 +199,7 @@ static void n_hdlc_tty_wakeup(struct tty_struct *tty);
 #define tty2n_hdlc(tty) ((struct n_hdlc *) ((tty)->disc_data))
 #define n_hdlc2tty(n_hdlc)      ((n_hdlc)->tty)
 
-static struct tty_ldisc n_hdlc_ldisc = {
+static struct tty_ldisc_ops n_hdlc_ldisc = {
         .owner          = THIS_MODULE,
         .magic          = TTY_LDISC_MAGIC,
         .name           = "hdlc",
@@ -342,8 +342,8 @@ static int n_hdlc_tty_open (struct tty_struct *tty)
 #endif
         
         /* Flush any pending characters in the driver and discipline. */
-        if (tty->ldisc.flush_buffer)
-                tty->ldisc.flush_buffer(tty);
+        if (tty->ldisc.ops->flush_buffer)
+                tty->ldisc.ops->flush_buffer(tty);
 
         tty_driver_flush_buffer(tty);
                 
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c
index 902169062332..ae377aa473ba 100644
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
@@ -143,7 +143,7 @@ static unsigned int r3964_poll(struct tty_struct *tty, struct file *file,
 static void r3964_receive_buf(struct tty_struct *tty, const unsigned char *cp,
                 char *fp, int count);
 
-static struct tty_ldisc tty_ldisc_N_R3964 = {
+static struct tty_ldisc_ops tty_ldisc_N_R3964 = {
         .owner = THIS_MODULE,
         .magic = TTY_LDISC_MAGIC,
         .name = "R3964",
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 8096389b0dc2..708c2b1dbe51 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -1573,7 +1573,7 @@ static unsigned int normal_poll(struct tty_struct *tty, struct file *file,
         return mask;
 }
 
-struct tty_ldisc tty_ldisc_N_TTY = {
+struct tty_ldisc_ops tty_ldisc_N_TTY = {
         .magic           = TTY_LDISC_MAGIC,
         .name            = "n_tty",
         .open            = n_tty_open,
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 197cd7a0c332..a22662b6a1a5 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -444,7 +444,7 @@ nvram_init(void)
 
         /* First test whether the driver should init at all */
         if (!CHECK_DRIVER_INIT())
-                return -ENXIO;
+                return -ENODEV;
 
         ret = misc_register(&nvram_dev);
         if (ret) {
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index fb2fb159faa3..b694d430f10e 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -514,8 +514,8 @@ static void ldisc_receive_buf(struct tty_struct *tty,
                 return;
         ld = tty_ldisc_ref(tty);
         if (ld) {
-                if (ld->receive_buf)
-                        ld->receive_buf(tty, data, flags, count);
+                if (ld->ops->receive_buf)
+                        ld->ops->receive_buf(tty, data, flags, count);
                 tty_ldisc_deref(ld);
         }
 }
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 0a05c038ae6f..76b27932d229 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -111,7 +111,7 @@ static int pty_write(struct tty_struct * tty, const unsigned char *buf, int coun
         c = to->receive_room;
         if (c > count)
                 c = count;
-        to->ldisc.receive_buf(to, buf, NULL, c);
+        to->ldisc.ops->receive_buf(to, buf, NULL, c);
         
         return c;
 }
@@ -149,11 +149,11 @@ static int pty_chars_in_buffer(struct tty_struct *tty)
         int count;
 
         /* We should get the line discipline lock for "tty->link" */
-        if (!to || !to->ldisc.chars_in_buffer)
+        if (!to || !to->ldisc.ops->chars_in_buffer)
                 return 0;
 
         /* The ldisc must report 0 if no characters available to be read */
-        count = to->ldisc.chars_in_buffer(to);
+        count = to->ldisc.ops->chars_in_buffer(to);
 
         if (tty->driver->subtype == PTY_TYPE_SLAVE) return count;
 
@@ -186,8 +186,8 @@ static void pty_flush_buffer(struct tty_struct *tty)
         if (!to)
                 return;
         
-        if (to->ldisc.flush_buffer)
-                to->ldisc.flush_buffer(to);
+        if (to->ldisc.ops->flush_buffer)
+                to->ldisc.ops->flush_buffer(to);
         
         if (to->packet) {
                 spin_lock_irqsave(&tty->ctrl_lock, flags);
diff --git a/drivers/char/rio/cirrus.h b/drivers/char/rio/cirrus.h
index a03a538a3efb..5ab51679caa2 100644
--- a/drivers/char/rio/cirrus.h
+++ b/drivers/char/rio/cirrus.h
@@ -35,9 +35,6 @@
  ***************************************************************************/
 
 #ifndef _cirrus_h
-#ifndef lint
-/* static char* _cirrus_h_sccs = "@(#)cirrus.h  1.16"; */
-#endif
 #define _cirrus_h 1
 
 /* Bit fields for particular registers shared with driver */
diff --git a/drivers/char/rio/cmdblk.h b/drivers/char/rio/cmdblk.h
index c46b2fdb6626..9ed4f861675a 100644
--- a/drivers/char/rio/cmdblk.h
+++ b/drivers/char/rio/cmdblk.h
@@ -33,12 +33,6 @@
 #ifndef __rio_cmdblk_h__
 #define __rio_cmdblk_h__
 
-#ifdef SCCS_LABELS
-#ifndef lint
-static char *_cmdblk_h_sccs_ = "@(#)cmdblk.h    1.2";
-#endif
-#endif
-
 /*
 ** the structure of a command block, used to queue commands destined for
 ** a rup.
diff --git a/drivers/char/rio/cmdpkt.h b/drivers/char/rio/cmdpkt.h
index 357ae5722436..c1e7a2798070 100644
--- a/drivers/char/rio/cmdpkt.h
+++ b/drivers/char/rio/cmdpkt.h
@@ -32,12 +32,6 @@
 #ifndef __rio_cmdpkt_h__
 #define __rio_cmdpkt_h__
 
-#ifdef SCCS_LABELS
-#ifndef lint
-static char *_cmdpkt_h_sccs_ = "@(#)cmdpkt.h    1.2";
-#endif
-#endif
-
 /*
 ** overlays for the data area of a packet. Used in both directions
 ** (to build a packet to send, and to interpret a packet that arrives)
diff --git a/drivers/char/rio/daemon.h b/drivers/char/rio/daemon.h
index 6e63f8b2c479..4af90323fd00 100644
--- a/drivers/char/rio/daemon.h
+++ b/drivers/char/rio/daemon.h
@@ -33,12 +33,6 @@
 #ifndef __rio_daemon_h__
 #define __rio_daemon_h__
 
-#ifdef SCCS_LABELS
-#ifndef lint
-static char *_daemon_h_sccs_ = "@(#)daemon.h    1.3";
-#endif
-#endif
-
 
 /*
 ** structures used on /dev/rio
diff --git a/drivers/char/rio/errors.h b/drivers/char/rio/errors.h
index 1d0d89144337..bdb05234090a 100644
--- a/drivers/char/rio/errors.h
+++ b/drivers/char/rio/errors.h
@@ -33,12 +33,6 @@
 #ifndef __rio_errors_h__
 #define __rio_errors_h__
 
-#ifdef SCCS_LABELS
-#ifndef lint
-static char *_errors_h_sccs_ = "@(#)errors.h    1.2";
-#endif
-#endif
-
 /*
 ** error codes
 */
diff --git a/drivers/char/rio/func.h b/drivers/char/rio/func.h
index 9e7283bd81a0..078d44f85e45 100644
--- a/drivers/char/rio/func.h
+++ b/drivers/char/rio/func.h
@@ -35,12 +35,6 @@
 
 #include <linux/kdev_t.h>
 
-#ifdef SCCS_LABELS
-#ifndef lint
-static char *_func_h_sccs_ = "@(#)func.h        1.3";
-#endif
-#endif
-
 /* rioboot.c */
 int RIOBootCodeRTA(struct rio_info *, struct DownLoad *);
 int RIOBootCodeHOST(struct rio_info *, struct DownLoad *);
diff --git a/drivers/char/rio/map.h b/drivers/char/rio/map.h
index bdbcd09c8b81..8366978578c1 100644
--- a/drivers/char/rio/map.h
+++ b/drivers/char/rio/map.h
@@ -33,10 +33,6 @@
 #ifndef __rio_map_h__
 #define __rio_map_h__
 
-#ifdef SCCS_LABELS
-static char *_map_h_sccs_ = "@(#)map.h  1.2";
-#endif
-
 /*
 ** mapping structure passed to and from the config.rio program to
 ** determine the current topology of the world
diff --git a/drivers/char/rio/param.h b/drivers/char/rio/param.h
index 675c200b2459..7e9b6283e8aa 100644
--- a/drivers/char/rio/param.h
+++ b/drivers/char/rio/param.h
@@ -33,11 +33,6 @@
 #ifndef __rio_param_h__
 #define __rio_param_h__
 
-#ifdef SCCS_LABELS
-static char *_param_h_sccs_ = "@(#)param.h      1.2";
-#endif
-
-
 /*
 ** the param command block, as used in OPEN and PARAM calls.
 */
diff --git a/drivers/char/rio/parmmap.h b/drivers/char/rio/parmmap.h
index 9764ef85c5a6..acc8fa439df5 100644
--- a/drivers/char/rio/parmmap.h
+++ b/drivers/char/rio/parmmap.h
@@ -37,13 +37,6 @@
 #ifndef _parmap_h
 #define _parmap_h
 
-
-#ifdef SCCS_LABELS
-#ifndef lint
-/* static char *_rio_parmmap_h_sccs = "@(#)parmmap.h    1.4"; */
-#endif
-#endif
-
 typedef struct PARM_MAP PARM_MAP;
 
 struct PARM_MAP {
diff --git a/drivers/char/rio/pci.h b/drivers/char/rio/pci.h
index 1eba9118079b..6032f9135956 100644
--- a/drivers/char/rio/pci.h
+++ b/drivers/char/rio/pci.h
@@ -33,10 +33,6 @@
 #ifndef __rio_pci_h__
 #define __rio_pci_h__
 
-#ifdef SCCS_LABELS
-static char *_pci_h_sccs_ = "@(#)pci.h  1.2";
-#endif
-
 /*
 ** PCI stuff
 */
diff --git a/drivers/char/rio/protsts.h b/drivers/char/rio/protsts.h
index 69fc4bc34153..8ab79401d3ee 100644
--- a/drivers/char/rio/protsts.h
+++ b/drivers/char/rio/protsts.h
@@ -37,13 +37,6 @@
 #ifndef _protsts_h
 #define _protsts_h 1
 
-
-#ifdef SCCS_LABELS
-#ifndef lint
-/* static char *_rio_protsts_h_sccs = "@(#)protsts.h    1.4"; */
-#endif
-#endif
-
 /*************************************************
  * ACK bit. Last Packet received OK. Set by
  * rxpkt to indicate that the Packet has been
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
index 412777cd1e68..0cdfee152916 100644
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
@@ -25,11 +25,6 @@
  *      Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
  *      USA.
  *
- * Revision history:
- * $Log: rio.c,v $
- * Revision 1.1  1999/07/11 10:13:54  wolff
- * Initial revision
- *
  * */
 
 #include <linux/module.h>
@@ -436,7 +431,7 @@ static void rio_disable_tx_interrupts(void *ptr)
 {
         func_enter();
 
-        /*  port->gs.flags &= ~GS_TX_INTEN; */
+        /*  port->gs.port.flags &= ~GS_TX_INTEN; */
 
         func_exit();
 }
@@ -460,7 +455,7 @@ static void rio_enable_tx_interrupts(void *ptr)
          * In general we cannot count on "tx empty" interrupts, although
          * the interrupt routine seems to be able to tell the difference.
          */
-        PortP->gs.flags &= ~GS_TX_INTEN;
+        PortP->gs.port.flags &= ~GS_TX_INTEN;
 
         func_exit();
 }
@@ -515,7 +510,7 @@ static void rio_shutdown_port(void *ptr)
         func_enter();
 
         PortP = (struct Port *) ptr;
-        PortP->gs.tty = NULL;
+        PortP->gs.port.tty = NULL;
         func_exit();
 }
 
@@ -534,7 +529,7 @@ static void rio_hungup(void *ptr)
         func_enter();
 
         PortP = (struct Port *) ptr;
-        PortP->gs.tty = NULL;
+        PortP->gs.port.tty = NULL;
 
         func_exit();
 }
@@ -554,12 +549,12 @@ static void rio_close(void *ptr)
 
         riotclose(ptr);
 
-        if (PortP->gs.count) {
-                printk(KERN_ERR "WARNING port count:%d\n", PortP->gs.count);
-                PortP->gs.count = 0;
+        if (PortP->gs.port.count) {
+                printk(KERN_ERR "WARNING port count:%d\n", PortP->gs.port.count);
+                PortP->gs.port.count = 0;
         }
 
-        PortP->gs.tty = NULL;
+        PortP->gs.port.tty = NULL;
         func_exit();
 }
 
@@ -854,8 +849,8 @@ static int rio_init_datastructures(void)
                 /*
                  * Initializing wait queue
                  */
-                init_waitqueue_head(&port->gs.open_wait);
-                init_waitqueue_head(&port->gs.close_wait);
+                init_waitqueue_head(&port->gs.port.open_wait);
+                init_waitqueue_head(&port->gs.port.close_wait);
         }
 #else
         /* We could postpone initializing them to when they are configured. */
diff --git a/drivers/char/rio/rioboard.h b/drivers/char/rio/rioboard.h
index 822c071a693b..252230043c82 100644
--- a/drivers/char/rio/rioboard.h
+++ b/drivers/char/rio/rioboard.h
@@ -29,12 +29,6 @@
 /*                                                                      */
 /************************************************************************/
 
-/* History...
-
-1.0.0   26/04/99 NPV    Creation.
-
-*/
-
 #ifndef _rioboard_h             /* If RIOBOARD.H not already defined */
 #define _rioboard_h    1
 
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c
index 7b96e0814887..01f2654d5a2e 100644
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/char/rio/riocmd.c
@@ -30,9 +30,6 @@
 **
 ** -----------------------------------------------------------------------------
 */
-#ifdef SCCS_LABELS
-static char *_riocmd_c_sccs_ = "@(#)riocmd.c    1.2";
-#endif
 
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -487,12 +484,12 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc
                                  ** If the device is a modem, then check the modem
                                  ** carrier.
                                  */
-                                if (PortP->gs.tty == NULL)
+                                if (PortP->gs.port.tty == NULL)
                                         break;
-                                if (PortP->gs.tty->termios == NULL)
+                                if (PortP->gs.port.tty->termios == NULL)
                                         break;
 
-                                if (!(PortP->gs.tty->termios->c_cflag & CLOCAL) && ((PortP->State & (RIO_MOPEN | RIO_WOPEN)))) {
+                                if (!(PortP->gs.port.tty->termios->c_cflag & CLOCAL) && ((PortP->State & (RIO_MOPEN | RIO_WOPEN)))) {
 
                                         rio_dprintk(RIO_DEBUG_CMD, "Is there a Carrier?\n");
                                         /*
@@ -509,7 +506,7 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc
                                                          ** wakeup anyone in WOPEN
                                                          */
                                                         if (PortP->State & (PORT_ISOPEN | RIO_WOPEN))
-                                                                wake_up_interruptible(&PortP->gs.open_wait);
+                                                                wake_up_interruptible(&PortP->gs.port.open_wait);
                                                 }
                                         } else {
                                                 /*
@@ -517,7 +514,7 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc
                                                  */
                                                 if (PortP->State & RIO_CARR_ON) {
                                                         if (PortP->State & (PORT_ISOPEN | RIO_WOPEN | RIO_MOPEN))
-                                                                tty_hangup(PortP->gs.tty);
+                                                                tty_hangup(PortP->gs.port.tty);
                                                         PortP->State &= ~RIO_CARR_ON;
                                                         rio_dprintk(RIO_DEBUG_CMD, "Carrirer just went down\n");
                                                 }
diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c
index d65ceb9a434a..eecee0f576d2 100644
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/char/rio/rioctrl.c
@@ -29,10 +29,6 @@
 **
 ** -----------------------------------------------------------------------------
 */
-#ifdef SCCS_LABELS
-static char *_rioctrl_c_sccs_ = "@(#)rioctrl.c  1.3";
-#endif
-
 
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/char/rio/riodrvr.h b/drivers/char/rio/riodrvr.h
index 3cffe275f216..0907e711b355 100644
--- a/drivers/char/rio/riodrvr.h
+++ b/drivers/char/rio/riodrvr.h
@@ -35,10 +35,6 @@
 
 #include <asm/param.h>          /* for HZ */
 
-#ifdef SCCS_LABELS
-static char *_riodrvr_h_sccs_ = "@(#)riodrvr.h  1.3";
-#endif
-
 #define MEMDUMP_SIZE    32
 #define MOD_DISABLE     (RIO_NOREAD|RIO_NOWRITE|RIO_NOXPRINT)
 
diff --git a/drivers/char/rio/rioinfo.h b/drivers/char/rio/rioinfo.h
index 8de7966e603a..42ff1e79d96f 100644
--- a/drivers/char/rio/rioinfo.h
+++ b/drivers/char/rio/rioinfo.h
@@ -33,10 +33,6 @@
 #ifndef __rioinfo_h
 #define __rioinfo_h
 
-#ifdef SCCS_LABELS
-static char *_rioinfo_h_sccs_ = "@(#)rioinfo.h  1.2";
-#endif
-
 /*
 ** Host card data structure
 */
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c
index add1718295ef..be0ba401966e 100644
--- a/drivers/char/rio/rioinit.c
+++ b/drivers/char/rio/rioinit.c
@@ -29,9 +29,6 @@
 **
 ** -----------------------------------------------------------------------------
 */
-#ifdef SCCS_LABELS
-static char *_rioinit_c_sccs_ = "@(#)rioinit.c  1.3";
-#endif
 
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c
index ea21686c69a4..71f87600907c 100644
--- a/drivers/char/rio/riointr.c
+++ b/drivers/char/rio/riointr.c
@@ -29,10 +29,6 @@
 **
 ** -----------------------------------------------------------------------------
 */
-#ifdef SCCS_LABELS
-static char *_riointr_c_sccs_ = "@(#)riointr.c  1.2";
-#endif
-
 
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -106,7 +102,7 @@ void RIOTxEnable(char *en)
 
         PortP = (struct Port *) en;
         p = (struct rio_info *) PortP->p;
-        tty = PortP->gs.tty;
+        tty = PortP->gs.port.tty;
 
 
         rio_dprintk(RIO_DEBUG_INTR, "tx port %d: %d chars queued.\n", PortP->PortNum, PortP->gs.xmit_cnt);
@@ -162,7 +158,7 @@ void RIOTxEnable(char *en)
         rio_spin_unlock_irqrestore(&PortP->portSem, flags);
 
         if (PortP->gs.xmit_cnt <= (PortP->gs.wakeup_chars + 2 * PKT_MAX_DATA_LEN))
-                tty_wakeup(PortP->gs.tty);
+                tty_wakeup(PortP->gs.port.tty);
 
 }
 
@@ -245,7 +241,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP)
                          ** find corresponding tty structure. The process of mapping
                          ** the ports puts these here.
                          */
-                        ttyP = PortP->gs.tty;
+                        ttyP = PortP->gs.port.tty;
 
                         /*
                          ** Lock the port before we begin working on it.
@@ -339,7 +335,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP)
                          ** find corresponding tty structure. The process of mapping
                          ** the ports puts these here.
                          */
-                        ttyP = PortP->gs.tty;
+                        ttyP = PortP->gs.port.tty;
                         /* If ttyP is NULL, the port is getting closed. Forget about it. */
                         if (!ttyP) {
                                 rio_dprintk(RIO_DEBUG_INTR, "no tty, so skipping.\n");
@@ -546,7 +542,7 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP)
 
         intCount++;
 
-        TtyP = PortP->gs.tty;
+        TtyP = PortP->gs.port.tty;
         if (!TtyP) {
                 rio_dprintk(RIO_DEBUG_INTR, "RIOReceive: tty is null. \n");
                 return;
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c
index 4810b845cc21..d687c17be152 100644
--- a/drivers/char/rio/rioparam.c
+++ b/drivers/char/rio/rioparam.c
@@ -30,10 +30,6 @@
 ** -----------------------------------------------------------------------------
 */
 
-#ifdef SCCS_LABELS
-static char *_rioparam_c_sccs_ = "@(#)rioparam.c        1.3";
-#endif
-
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
@@ -164,7 +160,7 @@ int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag)
 
         func_enter();
 
-        TtyP = PortP->gs.tty;
+        TtyP = PortP->gs.port.tty;
 
         rio_dprintk(RIO_DEBUG_PARAM, "RIOParam: Port:%d cmd:%d Modem:%d SleepFlag:%d Mapped: %d, tty=%p\n", PortP->PortNum, cmd, Modem, SleepFlag, PortP->Mapped, TtyP);
 
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c
index 7a9df7dcf9a8..706c2a25f7aa 100644
--- a/drivers/char/rio/rioroute.c
+++ b/drivers/char/rio/rioroute.c
@@ -29,9 +29,6 @@
 **
 ** -----------------------------------------------------------------------------
 */
-#ifdef SCCS_LABELS
-static char *_rioroute_c_sccs_ = "@(#)rioroute.c        1.3";
-#endif
 
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/char/rio/riospace.h b/drivers/char/rio/riospace.h
index 534f1f5b9f53..ffb31d4332b9 100644
--- a/drivers/char/rio/riospace.h
+++ b/drivers/char/rio/riospace.h
@@ -33,10 +33,6 @@
 #ifndef __rio_riospace_h__
 #define __rio_riospace_h__
 
-#ifdef SCCS_LABELS
-static char *_riospace_h_sccs_ = "@(#)riospace.h        1.2";
-#endif
-
 #define RIO_LOCATOR_LEN 16
 #define MAX_RIO_BOARDS  4
 
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
index 2b24488e95f2..3d15802dc0f3 100644
--- a/drivers/char/rio/riotable.c
+++ b/drivers/char/rio/riotable.c
@@ -29,9 +29,6 @@
 **
 ** -----------------------------------------------------------------------------
 */
-#ifdef SCCS_LABELS
-static char *_riotable_c_sccs_ = "@(#)riotable.c        1.2";
-#endif
 
 #include <linux/module.h>
 #include <linux/slab.h>
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c
index c99354843be1..2fb49e89b324 100644
--- a/drivers/char/rio/riotty.c
+++ b/drivers/char/rio/riotty.c
@@ -29,10 +29,6 @@
 **
 ** -----------------------------------------------------------------------------
 */
-#ifdef SCCS_LABELS
-static char *_riotty_c_sccs_ = "@(#)riotty.c    1.3";
-#endif
-
 
 #define __EXPLICIT_DEF_H__
 
@@ -144,14 +140,14 @@ int riotopen(struct tty_struct *tty, struct file *filp)
 
         tty->driver_data = PortP;
 
-        PortP->gs.tty = tty;
-        PortP->gs.count++;
+        PortP->gs.port.tty = tty;
+        PortP->gs.port.count++;
 
         rio_dprintk(RIO_DEBUG_TTY, "%d bytes in tx buffer\n", PortP->gs.xmit_cnt);
 
         retval = gs_init_port(&PortP->gs);
         if (retval) {
-                PortP->gs.count--;
+                PortP->gs.port.count--;
                 return -ENXIO;
         }
         /*
@@ -297,7 +293,7 @@ int riotopen(struct tty_struct *tty, struct file *filp)
          ** insert test for carrier here. -- ???
          ** I already see that test here. What's the deal? -- REW
          */
-        if ((PortP->gs.tty->termios->c_cflag & CLOCAL) ||
+        if ((PortP->gs.port.tty->termios->c_cflag & CLOCAL) ||
                         (PortP->ModemState & RIOC_MSVR1_CD)) {
                 rio_dprintk(RIO_DEBUG_TTY, "open(%d) Modem carr on\n", SysPort);
                 /*
@@ -305,16 +301,16 @@ int riotopen(struct tty_struct *tty, struct file *filp)
                    wakeup((caddr_t) &tp->tm.c_canq);
                  */
                 PortP->State |= RIO_CARR_ON;
-                wake_up_interruptible(&PortP->gs.open_wait);
+                wake_up_interruptible(&PortP->gs.port.open_wait);
         } else {        /* no carrier - wait for DCD */
                         /*
-                   while (!(PortP->gs.tty->termios->c_state & CARR_ON) &&
+                   while (!(PortP->gs.port.tty->termios->c_state & CARR_ON) &&
                    !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted )
                  */
                 while (!(PortP->State & RIO_CARR_ON) && !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted) {
                                 rio_dprintk(RIO_DEBUG_TTY, "open(%d) sleeping for carr on\n", SysPort);
                         /*
-                           PortP->gs.tty->termios->c_state |= WOPEN;
+                           PortP->gs.port.tty->termios->c_state |= WOPEN;
                          */
                         PortP->State |= RIO_WOPEN;
                         rio_spin_unlock_irqrestore(&PortP->portSem, flags);
@@ -384,7 +380,7 @@ int riotclose(void *ptr)
         /* PortP = p->RIOPortp[SysPort]; */
         rio_dprintk(RIO_DEBUG_TTY, "Port is at address %p\n", PortP);
         /* tp = PortP->TtyP; *//* Get tty */
-        tty = PortP->gs.tty;
+        tty = PortP->gs.port.tty;
         rio_dprintk(RIO_DEBUG_TTY, "TTY is at address %p\n", tty);
 
         if (PortP->gs.closing_wait)
diff --git a/drivers/char/rio/route.h b/drivers/char/rio/route.h
index 769744e575ab..20ed73f3fd7b 100644
--- a/drivers/char/rio/route.h
+++ b/drivers/char/rio/route.h
@@ -37,12 +37,6 @@
 #ifndef _route_h
 #define _route_h
 
-#ifdef SCCS_LABELS
-#ifndef lint
-/* static char *_rio_route_h_sccs = "@(#)route.h        1.3"; */
-#endif
-#endif
-
 #define MAX_LINKS 4
 #define MAX_NODES 17            /* Maximum nodes in a subnet */
 #define NODE_BYTES ((MAX_NODES / 8) + 1)        /* Number of bytes needed for
diff --git a/drivers/char/rio/unixrup.h b/drivers/char/rio/unixrup.h
index 46bd532f7746..7abf0cba0f2c 100644
--- a/drivers/char/rio/unixrup.h
+++ b/drivers/char/rio/unixrup.h
@@ -33,10 +33,6 @@
 #ifndef __rio_unixrup_h__
 #define __rio_unixrup_h__
 
-#ifdef SCCS_LABELS
-static char *_unixrup_h_sccs_ = "@(#)unixrup.h  1.2";
-#endif
-
 /*
 **    UnixRup data structure. This contains pointers to actual RUPs on the
 **    host card, and all the command/boot control stuff.
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index f073c710ab8d..724b2b20f4b2 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -322,7 +322,7 @@ static struct riscom_port *rc_get_port(struct riscom_board const *bp,
         channel = rc_in(bp, CD180_GICR) >> GICR_CHAN_OFF;
         if (channel < CD180_NCH)  {
                 port = &rc_port[board_No(bp) * RC_NPORT + channel];
-                if (port->flags & ASYNC_INITIALIZED)
+                if (port->port.flags & ASYNC_INITIALIZED)
                         return port;
         }
         printk(KERN_ERR "rc%d: %s interrupt from invalid port %d\n",
@@ -341,7 +341,7 @@ static void rc_receive_exc(struct riscom_board const *bp)
         if (port == NULL)
                 return;
 
-        tty = port->tty;
+        tty = port->port.tty;
 
 #ifdef RC_REPORT_OVERRUN
         status = rc_in(bp, CD180_RCSR);
@@ -364,7 +364,7 @@ static void rc_receive_exc(struct riscom_board const *bp)
                 printk(KERN_INFO "rc%d: port %d: Handling break...\n",
                        board_No(bp), port_No(port));
                 flag = TTY_BREAK;
-                if (port->flags & ASYNC_SAK)
+                if (port->port.flags & ASYNC_SAK)
                         do_SAK(tty);
 
         } else if (status & RCSR_PE)
@@ -392,7 +392,7 @@ static void rc_receive(struct riscom_board const *bp)
         if (port == NULL)
                 return;
 
-        tty = port->tty;
+        tty = port->port.tty;
 
         count = rc_in(bp, CD180_RDCR);
 
@@ -422,7 +422,7 @@ static void rc_transmit(struct riscom_board const *bp)
         if (port == NULL)
                 return;
 
-        tty = port->tty;
+        tty = port->port.tty;
 
         if (port->IER & IER_TXEMPTY) {
                 /* FIFO drained */
@@ -467,7 +467,7 @@ static void rc_transmit(struct riscom_board const *bp)
 
         count = CD180_NFIFO;
         do {
-                rc_out(bp, CD180_TDR, port->xmit_buf[port->xmit_tail++]);
+                rc_out(bp, CD180_TDR, port->port.xmit_buf[port->xmit_tail++]);
                 port->xmit_tail = port->xmit_tail & (SERIAL_XMIT_SIZE-1);
                 if (--port->xmit_cnt <= 0)
                         break;
@@ -492,12 +492,12 @@ static void rc_check_modem(struct riscom_board const *bp)
         if (port == NULL)
                 return;
 
-        tty = port->tty;
+        tty = port->port.tty;
 
         mcr = rc_in(bp, CD180_MCR);
         if (mcr & MCR_CDCHG) {
                 if (rc_in(bp, CD180_MSVR) & MSVR_CD)
-                        wake_up_interruptible(&port->open_wait);
+                        wake_up_interruptible(&port->port.open_wait);
                 else
                         tty_hangup(tty);
         }
@@ -632,15 +632,12 @@ static void rc_shutdown_board(struct riscom_board *bp)
  */
 static void rc_change_speed(struct riscom_board *bp, struct riscom_port *port)
 {
-        struct tty_struct *tty = port->tty;
+        struct tty_struct *tty = port->port.tty;
         unsigned long baud;
         long tmp;
         unsigned char cor1 = 0, cor3 = 0;
         unsigned char mcor1 = 0, mcor2 = 0;
 
-        if (tty == NULL || tty->termios == NULL)
-                return;
-
         port->IER  = 0;
         port->COR2 = 0;
         port->MSVR = MSVR_RTS;
@@ -786,39 +783,30 @@ static int rc_setup_port(struct riscom_board *bp, struct riscom_port *port)
 {
         unsigned long flags;
 
-        if (port->flags & ASYNC_INITIALIZED)
+        if (port->port.flags & ASYNC_INITIALIZED)
                 return 0;
 
-        if (!port->xmit_buf) {
-                /* We may sleep in get_zeroed_page() */
-                unsigned long tmp = get_zeroed_page(GFP_KERNEL);
-                if (tmp == 0)
-                        return -ENOMEM;
-                if (port->xmit_buf)
-                        free_page(tmp);
-                else
-                        port->xmit_buf = (unsigned char *) tmp;
-        }
+        if (tty_port_alloc_xmit_buf(&port->port) < 0)
+                return -ENOMEM;
+
         spin_lock_irqsave(&riscom_lock, flags);
 
-        if (port->tty)
-                clear_bit(TTY_IO_ERROR, &port->tty->flags);
-        if (port->count == 1)
+        clear_bit(TTY_IO_ERROR, &port->port.tty->flags);
+        if (port->port.count == 1)
                 bp->count++;
         port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
         rc_change_speed(bp, port);
-        port->flags |= ASYNC_INITIALIZED;
+        port->port.flags |= ASYNC_INITIALIZED;
 
         spin_unlock_irqrestore(&riscom_lock, flags);
         return 0;
 }
 
 /* Must be called with interrupts disabled */
-static void rc_shutdown_port(struct riscom_board *bp, struct riscom_port *port)
+static void rc_shutdown_port(struct tty_struct *tty,
+                        struct riscom_board *bp, struct riscom_port *port)
 {
-        struct tty_struct *tty;
-
-        if (!(port->flags & ASYNC_INITIALIZED))
+        if (!(port->port.flags & ASYNC_INITIALIZED))
                 return;
 
 #ifdef RC_REPORT_OVERRUN
@@ -836,14 +824,8 @@ static void rc_shutdown_port(struct riscom_board *bp, struct riscom_port *port)
                 printk("].\n");
         }
 #endif
-        if (port->xmit_buf)  {
-                free_page((unsigned long) port->xmit_buf);
-                port->xmit_buf = NULL;
-        }
-
-        tty = port->tty;
-
-        if (tty == NULL || C_HUPCL(tty)) {
+        tty_port_free_xmit_buf(&port->port);
+        if (C_HUPCL(tty)) {
                 /* Drop DTR */
                 bp->DTR |= (1u << port_No(port));
                 rc_out(bp, RC_DTR, bp->DTR);
@@ -858,9 +840,8 @@ static void rc_shutdown_port(struct riscom_board *bp, struct riscom_port *port)
         port->IER = 0;
         rc_out(bp, CD180_IER, port->IER);
 
-        if (tty)
-                set_bit(TTY_IO_ERROR, &tty->flags);
-        port->flags &= ~ASYNC_INITIALIZED;
+        set_bit(TTY_IO_ERROR, &tty->flags);
+        port->port.flags &= ~ASYNC_INITIALIZED;
 
         if (--bp->count < 0)  {
                 printk(KERN_INFO "rc%d: rc_shutdown_port: "
@@ -890,9 +871,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
          * If the device is in the middle of being closed, then block
          * until it's done, and then try again.
          */
-        if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&port->close_wait);
-                if (port->flags & ASYNC_HUP_NOTIFY)
+        if (tty_hung_up_p(filp) || port->port.flags & ASYNC_CLOSING) {
+                interruptible_sleep_on(&port->port.close_wait);
+                if (port->port.flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
                 else
                         return -ERESTARTSYS;
@@ -904,7 +885,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
          */
         if ((filp->f_flags & O_NONBLOCK) ||
             (tty->flags & (1 << TTY_IO_ERROR))) {
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+                port->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
 
@@ -919,16 +900,16 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
          * exit, either normal or abnormal.
          */
         retval = 0;
-        add_wait_queue(&port->open_wait, &wait);
+        add_wait_queue(&port->port.open_wait, &wait);
 
         spin_lock_irqsave(&riscom_lock, flags);
 
         if (!tty_hung_up_p(filp))
-                port->count--;
+                port->port.count--;
 
         spin_unlock_irqrestore(&riscom_lock, flags);
 
-        port->blocked_open++;
+        port->port.blocked_open++;
         while (1) {
                 spin_lock_irqsave(&riscom_lock, flags);
 
@@ -942,14 +923,14 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
                 set_current_state(TASK_INTERRUPTIBLE);
                 if (tty_hung_up_p(filp) ||
-                    !(port->flags & ASYNC_INITIALIZED)) {
-                        if (port->flags & ASYNC_HUP_NOTIFY)
+                    !(port->port.flags & ASYNC_INITIALIZED)) {
+                        if (port->port.flags & ASYNC_HUP_NOTIFY)
                                 retval = -EAGAIN;
                         else
                                 retval = -ERESTARTSYS;
                         break;
                 }
-                if (!(port->flags & ASYNC_CLOSING) &&
+                if (!(port->port.flags & ASYNC_CLOSING) &&
                     (do_clocal || CD))
                         break;
                 if (signal_pending(current)) {
@@ -959,14 +940,14 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 schedule();
         }
         __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
+        remove_wait_queue(&port->port.open_wait, &wait);
         if (!tty_hung_up_p(filp))
-                port->count++;
-        port->blocked_open--;
+                port->port.count++;
+        port->port.blocked_open--;
         if (retval)
                 return retval;
 
-        port->flags |= ASYNC_NORMAL_ACTIVE;
+        port->port.flags |= ASYNC_NORMAL_ACTIVE;
         return 0;
 }
 
@@ -990,9 +971,9 @@ static int rc_open(struct tty_struct *tty, struct file *filp)
         if (error)
                 return error;
 
-        port->count++;
+        port->port.count++;
         tty->driver_data = port;
-        port->tty = tty;
+        port->port.tty = tty;
 
         error = rc_setup_port(bp, port);
         if (error == 0)
@@ -1031,28 +1012,28 @@ static void rc_close(struct tty_struct *tty, struct file *filp)
                 goto out;
 
         bp = port_Board(port);
-        if ((tty->count == 1) && (port->count != 1))  {
+        if ((tty->count == 1) && (port->port.count != 1))  {
                 printk(KERN_INFO "rc%d: rc_close: bad port count;"
                        " tty->count is 1, port count is %d\n",
-                       board_No(bp), port->count);
-                port->count = 1;
+                       board_No(bp), port->port.count);
+                port->port.count = 1;
         }
-        if (--port->count < 0)  {
+        if (--port->port.count < 0)  {
                 printk(KERN_INFO "rc%d: rc_close: bad port count "
                                  "for tty%d: %d\n",
-                       board_No(bp), port_No(port), port->count);
-                port->count = 0;
+                       board_No(bp), port_No(port), port->port.count);
+                port->port.count = 0;
         }
-        if (port->count)
+        if (port->port.count)
                 goto out;
-        port->flags |= ASYNC_CLOSING;
+        port->port.flags |= ASYNC_CLOSING;
         /*
          * Now we wait for the transmit buffer to clear; and we notify
          * the line discipline to only process XON/XOFF characters.
          */
         tty->closing = 1;
-        if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, port->closing_wait);
+        if (port->port.closing_wait != ASYNC_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, port->port.closing_wait);
         /*
          * At this point we stop accepting input.  To do this, we
          * disable the receive line status interrupts, and tell the
@@ -1060,7 +1041,7 @@ static void rc_close(struct tty_struct *tty, struct file *filp)
          * line status register.
          */
         port->IER &= ~IER_RXD;
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (port->port.flags & ASYNC_INITIALIZED) {
                 port->IER &= ~IER_TXRDY;
                 port->IER |= IER_TXEMPTY;
                 rc_out(bp, CD180_CAR, port_No(port));
@@ -1077,19 +1058,19 @@ static void rc_close(struct tty_struct *tty, struct file *filp)
                                 break;
                 }
         }
-        rc_shutdown_port(bp, port);
+        rc_shutdown_port(tty, bp, port);
         rc_flush_buffer(tty);
         tty_ldisc_flush(tty);
 
         tty->closing = 0;
-        port->tty = NULL;
-        if (port->blocked_open) {
-                if (port->close_delay)
-                        msleep_interruptible(jiffies_to_msecs(port->close_delay));
-                wake_up_interruptible(&port->open_wait);
+        port->port.tty = NULL;
+        if (port->port.blocked_open) {
+                if (port->port.close_delay)
+                        msleep_interruptible(jiffies_to_msecs(port->port.close_delay));
+                wake_up_interruptible(&port->port.open_wait);
         }
-        port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&port->close_wait);
+        port->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        wake_up_interruptible(&port->port.close_wait);
 
 out:
         spin_unlock_irqrestore(&riscom_lock, flags);
@@ -1108,9 +1089,6 @@ static int rc_write(struct tty_struct *tty,
 
         bp = port_Board(port);
 
-        if (!tty || !port->xmit_buf)
-                return 0;
-
         while (1) {
                 spin_lock_irqsave(&riscom_lock, flags);
 
@@ -1119,7 +1097,7 @@ static int rc_write(struct tty_struct *tty,
                 if (c <= 0)
                         break;  /* lock continues to be held */
 
-                memcpy(port->xmit_buf + port->xmit_head, buf, c);
+                memcpy(port->port.xmit_buf + port->xmit_head, buf, c);
                 port->xmit_head = (port->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
                 port->xmit_cnt += c;
 
@@ -1151,15 +1129,12 @@ static int rc_put_char(struct tty_struct *tty, unsigned char ch)
         if (rc_paranoia_check(port, tty->name, "rc_put_char"))
                 return 0;
 
-        if (!tty || !port->xmit_buf)
-                return 0;
-
         spin_lock_irqsave(&riscom_lock, flags);
 
         if (port->xmit_cnt >= SERIAL_XMIT_SIZE - 1)
                 goto out;
 
-        port->xmit_buf[port->xmit_head++] = ch;
+        port->port.xmit_buf[port->xmit_head++] = ch;
         port->xmit_head &= SERIAL_XMIT_SIZE - 1;
         port->xmit_cnt++;
         ret = 1;
@@ -1177,8 +1152,7 @@ static void rc_flush_chars(struct tty_struct *tty)
         if (rc_paranoia_check(port, tty->name, "rc_flush_chars"))
                 return;
 
-        if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-            !port->xmit_buf)
+        if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped)
                 return;
 
         spin_lock_irqsave(&riscom_lock, flags);
@@ -1317,22 +1291,22 @@ static int rc_set_serial_info(struct riscom_port *port,
                 return -EINVAL;
 #endif
 
-        change_speed = ((port->flags & ASYNC_SPD_MASK) !=
+        change_speed = ((port->port.flags & ASYNC_SPD_MASK) !=
                         (tmp.flags & ASYNC_SPD_MASK));
 
         if (!capable(CAP_SYS_ADMIN)) {
-                if ((tmp.close_delay != port->close_delay) ||
-                    (tmp.closing_wait != port->closing_wait) ||
+                if ((tmp.close_delay != port->port.close_delay) ||
+                    (tmp.closing_wait != port->port.closing_wait) ||
                     ((tmp.flags & ~ASYNC_USR_MASK) !=
-                     (port->flags & ~ASYNC_USR_MASK)))
+                     (port->port.flags & ~ASYNC_USR_MASK)))
                         return -EPERM;
-                port->flags = ((port->flags & ~ASYNC_USR_MASK) |
+                port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK) |
                                (tmp.flags & ASYNC_USR_MASK));
         } else  {
-                port->flags = ((port->flags & ~ASYNC_FLAGS) |
+                port->port.flags = ((port->port.flags & ~ASYNC_FLAGS) |
                                (tmp.flags & ASYNC_FLAGS));
-                port->close_delay = tmp.close_delay;
-                port->closing_wait = tmp.closing_wait;
+                port->port.close_delay = tmp.close_delay;
+                port->port.closing_wait = tmp.closing_wait;
         }
         if (change_speed)  {
                 unsigned long flags;
@@ -1355,10 +1329,10 @@ static int rc_get_serial_info(struct riscom_port *port,
         tmp.line = port - rc_port;
         tmp.port = bp->base;
         tmp.irq  = bp->irq;
-        tmp.flags = port->flags;
+        tmp.flags = port->port.flags;
         tmp.baud_base = (RC_OSCFREQ + CD180_TPC/2) / CD180_TPC;
-        tmp.close_delay = port->close_delay * HZ/100;
-        tmp.closing_wait = port->closing_wait * HZ/100;
+        tmp.close_delay = port->port.close_delay * HZ/100;
+        tmp.closing_wait = port->port.closing_wait * HZ/100;
         tmp.xmit_fifo_size = CD180_NFIFO;
         return copy_to_user(retinfo, &tmp, sizeof(tmp)) ? -EFAULT : 0;
 }
@@ -1480,7 +1454,7 @@ static void rc_start(struct tty_struct *tty)
 
         spin_lock_irqsave(&riscom_lock, flags);
 
-        if (port->xmit_cnt && port->xmit_buf && !(port->IER & IER_TXRDY)) {
+        if (port->xmit_cnt && port->port.xmit_buf && !(port->IER & IER_TXRDY)) {
                 port->IER |= IER_TXRDY;
                 rc_out(bp, CD180_CAR, port_No(port));
                 rc_out(bp, CD180_IER, port->IER);
@@ -1498,11 +1472,11 @@ static void rc_hangup(struct tty_struct *tty)
 
         bp = port_Board(port);
 
-        rc_shutdown_port(bp, port);
-        port->count = 0;
-        port->flags &= ~ASYNC_NORMAL_ACTIVE;
-        port->tty = NULL;
-        wake_up_interruptible(&port->open_wait);
+        rc_shutdown_port(tty, bp, port);
+        port->port.count = 0;
+        port->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        port->port.tty = NULL;
+        wake_up_interruptible(&port->port.open_wait);
 }
 
 static void rc_set_termios(struct tty_struct *tty,
@@ -1575,11 +1549,8 @@ static int __init rc_init_drivers(void)
         }
         memset(rc_port, 0, sizeof(rc_port));
         for (i = 0; i < RC_NPORT * RC_NBOARD; i++)  {
+                tty_port_init(&rc_port[i].port);
                 rc_port[i].magic = RISCOM8_MAGIC;
-                rc_port[i].close_delay = 50 * HZ / 100;
-                rc_port[i].closing_wait = 3000 * HZ / 100;
-                init_waitqueue_head(&rc_port[i].open_wait);
-                init_waitqueue_head(&rc_port[i].close_wait);
         }
         return 0;
 }
diff --git a/drivers/char/riscom8.h b/drivers/char/riscom8.h
index cdfdf4394477..c9876b3f9714 100644
--- a/drivers/char/riscom8.h
+++ b/drivers/char/riscom8.h
@@ -66,23 +66,15 @@ struct riscom_board {
         
 struct riscom_port {
         int                     magic;
+        struct                  tty_port port;
         int                     baud_base;
-        int                     flags;
-        struct tty_struct       * tty;
-        int                     count;
-        int                     blocked_open;
         int                     timeout;
-        int                     close_delay;
-        unsigned char           * xmit_buf;
         int                     custom_divisor;
         int                     xmit_head;
         int                     xmit_tail;
         int                     xmit_cnt;
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
         short                   wakeup_chars;
         short                   break_length;
-        unsigned short          closing_wait;
         unsigned char           mark_mask;
         unsigned char           IER;
         unsigned char           MSVR;
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 743dc80a9325..e670eae2f510 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -72,6 +72,7 @@
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
+#include <linux/serial.h>
 #include <linux/string.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
@@ -81,7 +82,7 @@
 #include <linux/completion.h>
 #include <linux/wait.h>
 #include <linux/pci.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/atomic.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
@@ -434,15 +435,15 @@ static void rp_do_transmit(struct r_port *info)
 #endif
         if (!info)
                 return;
-        if (!info->tty) {
+        if (!info->port.tty) {
                 printk(KERN_WARNING "rp: WARNING %s called with "
-                                "info->tty==NULL\n", __func__);
+                                "info->port.tty==NULL\n", __func__);
                 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
                 return;
         }
 
         spin_lock_irqsave(&info->slock, flags);
-        tty = info->tty;
+        tty = info->port.tty;
         info->xmit_fifo_room = TXFIFO_SIZE - sGetTxCnt(cp);
 
         /*  Loop sending data to FIFO until done or FIFO full */
@@ -502,13 +503,13 @@ static void rp_handle_port(struct r_port *info)
                                 "info->flags & NOT_INIT\n");
                 return;
         }
-        if (!info->tty) {
+        if (!info->port.tty) {
                 printk(KERN_WARNING "rp: WARNING: rp_handle_port called with "
-                                "info->tty==NULL\n");
+                                "info->port.tty==NULL\n");
                 return;
         }
         cp = &info->channel;
-        tty = info->tty;
+        tty = info->port.tty;
 
         IntMask = sGetChanIntID(cp) & info->intmask;
 #ifdef ROCKET_DEBUG_INTR
@@ -530,7 +531,7 @@ static void rp_handle_port(struct r_port *info)
                         tty_hangup(tty);
                 }
                 info->cd_status = (ChanStatus & CD_ACT) ? 1 : 0;
-                wake_up_interruptible(&info->open_wait);
+                wake_up_interruptible(&info->port.open_wait);
         }
 #ifdef ROCKET_DEBUG_INTR
         if (IntMask & DELTA_CTS) {      /* CTS change */
@@ -648,9 +649,9 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
         info->board = board;
         info->aiop = aiop;
         info->chan = chan;
-        info->closing_wait = 3000;
-        info->close_delay = 50;
-        init_waitqueue_head(&info->open_wait);
+        info->port.closing_wait = 3000;
+        info->port.close_delay = 50;
+        init_waitqueue_head(&info->port.open_wait);
         init_completion(&info->close_wait);
         info->flags &= ~ROCKET_MODE_MASK;
         switch (pc104[board][line]) {
@@ -717,7 +718,7 @@ static void configure_r_port(struct r_port *info,
         unsigned rocketMode;
         int bits, baud, divisor;
         CHANNEL_t *cp;
-        struct ktermios *t = info->tty->termios;
+        struct ktermios *t = info->port.tty->termios;
 
         cp = &info->channel;
         cflag = t->c_cflag;
@@ -750,7 +751,7 @@ static void configure_r_port(struct r_port *info,
         }
 
         /* baud rate */
-        baud = tty_get_baud_rate(info->tty);
+        baud = tty_get_baud_rate(info->port.tty);
         if (!baud)
                 baud = 9600;
         divisor = ((rp_baud_base[info->board] + (baud >> 1)) / baud) - 1;
@@ -768,7 +769,7 @@ static void configure_r_port(struct r_port *info,
         sSetBaud(cp, divisor);
 
         /* FIXME: Should really back compute a baud rate from the divisor */
-        tty_encode_baud_rate(info->tty, baud, baud);
+        tty_encode_baud_rate(info->port.tty, baud, baud);
 
         if (cflag & CRTSCTS) {
                 info->intmask |= DELTA_CTS;
@@ -793,15 +794,15 @@ static void configure_r_port(struct r_port *info,
          * Handle software flow control in the board
          */
 #ifdef ROCKET_SOFT_FLOW
-        if (I_IXON(info->tty)) {
+        if (I_IXON(info->port.tty)) {
                 sEnTxSoftFlowCtl(cp);
-                if (I_IXANY(info->tty)) {
+                if (I_IXANY(info->port.tty)) {
                         sEnIXANY(cp);
                 } else {
                         sDisIXANY(cp);
                 }
-                sSetTxXONChar(cp, START_CHAR(info->tty));
-                sSetTxXOFFChar(cp, STOP_CHAR(info->tty));
+                sSetTxXONChar(cp, START_CHAR(info->port.tty));
+                sSetTxXOFFChar(cp, STOP_CHAR(info->port.tty));
         } else {
                 sDisTxSoftFlowCtl(cp);
                 sDisIXANY(cp);
@@ -813,24 +814,24 @@ static void configure_r_port(struct r_port *info,
          * Set up ignore/read mask words
          */
         info->read_status_mask = STMRCVROVRH | 0xFF;
-        if (I_INPCK(info->tty))
+        if (I_INPCK(info->port.tty))
                 info->read_status_mask |= STMFRAMEH | STMPARITYH;
-        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
+        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
                 info->read_status_mask |= STMBREAKH;
 
         /*
          * Characters to ignore
          */
         info->ignore_status_mask = 0;
-        if (I_IGNPAR(info->tty))
+        if (I_IGNPAR(info->port.tty))
                 info->ignore_status_mask |= STMFRAMEH | STMPARITYH;
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(info->port.tty)) {
                 info->ignore_status_mask |= STMBREAKH;
                 /*
                  * If we're ignoring parity and break indicators,
                  * ignore overruns too.  (For real raw support).
                  */
-                if (I_IGNPAR(info->tty))
+                if (I_IGNPAR(info->port.tty))
                         info->ignore_status_mask |= STMRCVROVRH;
         }
 
@@ -863,7 +864,7 @@ static void configure_r_port(struct r_port *info,
         }
 }
 
-/*  info->count is considered critical, protected by spinlocks.  */
+/*  info->port.count is considered critical, protected by spinlocks.  */
 static int block_til_ready(struct tty_struct *tty, struct file *filp,
                            struct r_port *info)
 {
@@ -897,13 +898,13 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
         /*
          * Block waiting for the carrier detect and the line to become free.  While we are in
-         * this loop, info->count is dropped by one, so that rp_close() knows when to free things.  
+         * this loop, info->port.count is dropped by one, so that rp_close() knows when to free things.
          * We restore it upon exit, either normal or abnormal.
          */
         retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
+        add_wait_queue(&info->port.open_wait, &wait);
 #ifdef ROCKET_DEBUG_OPEN
-        printk(KERN_INFO "block_til_ready before block: ttyR%d, count = %d\n", info->line, info->count);
+        printk(KERN_INFO "block_til_ready before block: ttyR%d, count = %d\n", info->line, info->port.count);
 #endif
         spin_lock_irqsave(&info->slock, flags);
 
@@ -912,10 +913,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 #else
         if (!tty_hung_up_p(filp)) {
                 extra_count = 1;
-                info->count--;
+                info->port.count--;
         }
 #endif
-        info->blocked_open++;
+        info->port.blocked_open++;
 
         spin_unlock_irqrestore(&info->slock, flags);
 
@@ -940,24 +941,24 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 }
 #ifdef ROCKET_DEBUG_OPEN
                 printk(KERN_INFO "block_til_ready blocking: ttyR%d, count = %d, flags=0x%0x\n",
-                     info->line, info->count, info->flags);
+                     info->line, info->port.count, info->flags);
 #endif
                 schedule();     /*  Don't hold spinlock here, will hang PC */
         }
         __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
+        remove_wait_queue(&info->port.open_wait, &wait);
 
         spin_lock_irqsave(&info->slock, flags);
 
         if (extra_count)
-                info->count++;
-        info->blocked_open--;
+                info->port.count++;
+        info->port.blocked_open--;
 
         spin_unlock_irqrestore(&info->slock, flags);
 
 #ifdef ROCKET_DEBUG_OPEN
         printk(KERN_INFO "block_til_ready after blocking: ttyR%d, count = %d\n",
-               info->line, info->count);
+               info->line, info->port.count);
 #endif
         if (retval)
                 return retval;
@@ -1001,9 +1002,9 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
                 info->xmit_buf = (unsigned char *) page;
 
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
 
-        if (info->count++ == 0) {
+        if (info->port.count++ == 0) {
                 atomic_inc(&rp_num_ports_open);
 
 #ifdef ROCKET_DEBUG_OPEN
@@ -1012,7 +1013,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
 #endif
         }
 #ifdef ROCKET_DEBUG_OPEN
-        printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->count);
+        printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
 #endif
 
         /*
@@ -1048,13 +1049,13 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
                  * Set up the tty->alt_speed kludge
                  */
                 if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_HI)
-                        info->tty->alt_speed = 57600;
+                        info->port.tty->alt_speed = 57600;
                 if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_VHI)
-                        info->tty->alt_speed = 115200;
+                        info->port.tty->alt_speed = 115200;
                 if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_SHI)
-                        info->tty->alt_speed = 230400;
+                        info->port.tty->alt_speed = 230400;
                 if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_WARP)
-                        info->tty->alt_speed = 460800;
+                        info->port.tty->alt_speed = 460800;
 
                 configure_r_port(info, NULL);
                 if (tty->termios->c_cflag & CBAUD) {
@@ -1076,7 +1077,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
 }
 
 /*
- *  Exception handler that closes a serial port. info->count is considered critical. 
+ *  Exception handler that closes a serial port. info->port.count is considered critical.
  */
 static void rp_close(struct tty_struct *tty, struct file *filp)
 {
@@ -1089,14 +1090,14 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
                 return;
 
 #ifdef ROCKET_DEBUG_OPEN
-        printk(KERN_INFO "rp_close ttyR%d, count = %d\n", info->line, info->count);
+        printk(KERN_INFO "rp_close ttyR%d, count = %d\n", info->line, info->port.count);
 #endif
 
         if (tty_hung_up_p(filp))
                 return;
         spin_lock_irqsave(&info->slock, flags);
 
-        if ((tty->count == 1) && (info->count != 1)) {
+        if ((tty->count == 1) && (info->port.count != 1)) {
                 /*
                  * Uh, oh.  tty->count is 1, which means that the tty
                  * structure will be freed.  Info->count should always
@@ -1105,15 +1106,15 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
                  * serial port won't be shutdown.
                  */
                 printk(KERN_WARNING "rp_close: bad serial port count; "
-                        "tty->count is 1, info->count is %d\n", info->count);
-                info->count = 1;
+                        "tty->count is 1, info->port.count is %d\n", info->port.count);
+                info->port.count = 1;
         }
-        if (--info->count < 0) {
+        if (--info->port.count < 0) {
                 printk(KERN_WARNING "rp_close: bad serial port count for "
-                                "ttyR%d: %d\n", info->line, info->count);
-                info->count = 0;
+                                "ttyR%d: %d\n", info->line, info->port.count);
+                info->port.count = 0;
         }
-        if (info->count) {
+        if (info->port.count) {
                 spin_unlock_irqrestore(&info->slock, flags);
                 return;
         }
@@ -1137,8 +1138,8 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
         /*
          * Wait for the transmit buffer to clear
          */
-        if (info->closing_wait != ROCKET_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, info->closing_wait);
+        if (info->port.closing_wait != ROCKET_CLOSING_WAIT_NONE)
+                tty_wait_until_sent(tty, info->port.closing_wait);
         /*
          * Before we drop DTR, make sure the UART transmitter
          * has completely drained; this is especially
@@ -1167,11 +1168,11 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
 
         clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
 
-        if (info->blocked_open) {
-                if (info->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
+        if (info->port.blocked_open) {
+                if (info->port.close_delay) {
+                        msleep_interruptible(jiffies_to_msecs(info->port.close_delay));
                 }
-                wake_up_interruptible(&info->open_wait);
+                wake_up_interruptible(&info->port.open_wait);
         } else {
                 if (info->xmit_buf) {
                         free_page((unsigned long) info->xmit_buf);
@@ -1327,8 +1328,8 @@ static int get_config(struct r_port *info, struct rocket_config __user *retinfo)
         memset(&tmp, 0, sizeof (tmp));
         tmp.line = info->line;
         tmp.flags = info->flags;
-        tmp.close_delay = info->close_delay;
-        tmp.closing_wait = info->closing_wait;
+        tmp.close_delay = info->port.close_delay;
+        tmp.closing_wait = info->port.closing_wait;
         tmp.port = rcktpt_io_addr[(info->line >> 5) & 3];
 
         if (copy_to_user(retinfo, &tmp, sizeof (*retinfo)))
@@ -1353,17 +1354,17 @@ static int set_config(struct r_port *info, struct rocket_config __user *new_info
         }
 
         info->flags = ((info->flags & ~ROCKET_FLAGS) | (new_serial.flags & ROCKET_FLAGS));
-        info->close_delay = new_serial.close_delay;
-        info->closing_wait = new_serial.closing_wait;
+        info->port.close_delay = new_serial.close_delay;
+        info->port.closing_wait = new_serial.closing_wait;
 
         if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_HI)
-                info->tty->alt_speed = 57600;
+                info->port.tty->alt_speed = 57600;
         if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_VHI)
-                info->tty->alt_speed = 115200;
+                info->port.tty->alt_speed = 115200;
         if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_SHI)
-                info->tty->alt_speed = 230400;
+                info->port.tty->alt_speed = 230400;
         if ((info->flags & ROCKET_SPD_MASK) == ROCKET_SPD_WARP)
-                info->tty->alt_speed = 460800;
+                info->port.tty->alt_speed = 460800;
 
         configure_r_port(info, NULL);
         return 0;
@@ -1636,13 +1637,13 @@ static void rp_hangup(struct tty_struct *tty)
         rp_flush_buffer(tty);
         if (info->flags & ROCKET_CLOSING)
                 return;
-        if (info->count) 
+        if (info->port.count)
                 atomic_dec(&rp_num_ports_open);
         clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
 
-        info->count = 0;
+        info->port.count = 0;
         info->flags &= ~ROCKET_NORMAL_ACTIVE;
-        info->tty = NULL;
+        info->port.tty = NULL;
 
         cp = &info->channel;
         sDisRxFIFO(cp);
@@ -1653,7 +1654,7 @@ static void rp_hangup(struct tty_struct *tty)
         sClrTxXOFF(cp);
         info->flags &= ~ROCKET_INITIALIZED;
 
-        wake_up_interruptible(&info->open_wait);
+        wake_up_interruptible(&info->port.open_wait);
 }
 
 /*
@@ -1762,7 +1763,7 @@ static int rp_write(struct tty_struct *tty,
 
         /*  Write remaining data into the port's xmit_buf */
         while (1) {
-                if (!info->tty)         /* Seemingly obligatory check... */
+                if (!info->port.tty)            /* Seemingly obligatory check... */
                         goto end;
                 c = min(count, XMIT_BUF_SIZE - info->xmit_cnt - 1);
                 c = min(c, XMIT_BUF_SIZE - info->xmit_head);
diff --git a/drivers/char/rocket.h b/drivers/char/rocket.h
index ae6b04f90c03..a8b09195ebba 100644
--- a/drivers/char/rocket.h
+++ b/drivers/char/rocket.h
@@ -64,8 +64,8 @@ struct rocket_version {
 /*
  * For closing_wait and closing_wait2
  */
-#define ROCKET_CLOSING_WAIT_NONE        65535
-#define ROCKET_CLOSING_WAIT_INF         0
+#define ROCKET_CLOSING_WAIT_NONE        ASYNC_CLOSING_WAIT_NONE
+#define ROCKET_CLOSING_WAIT_INF         ASYNC_CLOSING_WAIT_INF
 
 /*
  * Rocketport ioctls -- "RP"
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index 143cc432fdb2..21f3ff53ba32 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -1125,18 +1125,14 @@ Warnings: This function writes the data byte without checking to see if
 
 struct r_port {
         int magic;
+        struct tty_port port;
         int line;
-        int flags;
-        int count;
-        int blocked_open;
-        struct tty_struct *tty;
+        int flags;              /* Don't yet match the ASY_ flags!! */
         unsigned int board:3;
         unsigned int aiop:2;
         unsigned int chan:3;
         CONTROLLER_t *ctlp;
         CHANNEL_t channel;
-        int closing_wait;
-        int close_delay;
         int intmask;
         int xmit_fifo_room;     /* room in xmit fifo */
         unsigned char *xmit_buf;
@@ -1148,8 +1144,7 @@ struct r_port {
         int read_status_mask;
         int cps;
 
-        wait_queue_head_t open_wait;
-        struct completion close_wait;
+        struct completion close_wait;   /* Not yet matching the core */
         spinlock_t slock;
         struct mutex write_mtx;
 };
diff --git a/drivers/char/selection.c b/drivers/char/selection.c
index d63f5ccc29e6..2978a49a172b 100644
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
@@ -327,7 +327,8 @@ int paste_selection(struct tty_struct *tty)
                 }
                 count = sel_buffer_lth - pasted;
                 count = min(count, tty->receive_room);
-                tty->ldisc.receive_buf(tty, sel_buffer + pasted, NULL, count);
+                tty->ldisc.ops->receive_buf(tty, sel_buffer + pasted,
+                                                                NULL, count);
                 pasted += count;
         }
         remove_wait_queue(&vc->paste_wait, &wait);
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 2ee4d9893757..037dc47e4cb1 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -608,9 +608,9 @@ static inline struct specialix_port * sx_get_port(struct specialix_board * bp,
         dprintk (SX_DEBUG_CHAN, "channel: %d\n", channel);
         if (channel < CD186x_NCH) {
                 port = &sx_port[board_No(bp) * SX_NPORT + channel];
-                dprintk (SX_DEBUG_CHAN, "port: %d %p flags: 0x%x\n",board_No(bp) * SX_NPORT + channel,  port, port->flags & ASYNC_INITIALIZED);
+                dprintk (SX_DEBUG_CHAN, "port: %d %p flags: 0x%lx\n",board_No(bp) * SX_NPORT + channel,  port, port->port.flags & ASYNC_INITIALIZED);
 
-                if (port->flags & ASYNC_INITIALIZED) {
+                if (port->port.flags & ASYNC_INITIALIZED) {
                         dprintk (SX_DEBUG_CHAN, "port: %d %p\n", channel, port);
                         func_exit();
                         return port;
@@ -637,7 +637,7 @@ static inline void sx_receive_exc(struct specialix_board * bp)
                 func_exit();
                 return;
         }
-        tty = port->tty;
+        tty = port->port.tty;
 
         status = sx_in(bp, CD186x_RCSR);
 
@@ -673,7 +673,7 @@ static inline void sx_receive_exc(struct specialix_board * bp)
                 dprintk(SX_DEBUG_RX, "sx%d: port %d: Handling break...\n",
                        board_No(bp), port_No(port));
                 flag = TTY_BREAK;
-                if (port->flags & ASYNC_SAK)
+                if (port->port.flags & ASYNC_SAK)
                         do_SAK(tty);
 
         } else if (status & RCSR_PE)
@@ -707,7 +707,7 @@ static inline void sx_receive(struct specialix_board * bp)
                 func_exit();
                 return;
         }
-        tty = port->tty;
+        tty = port->port.tty;
 
         count = sx_in(bp, CD186x_RDCR);
         dprintk (SX_DEBUG_RX, "port: %p: count: %d\n", port, count);
@@ -734,7 +734,7 @@ static inline void sx_transmit(struct specialix_board * bp)
                 return;
         }
         dprintk (SX_DEBUG_TX, "port: %p\n", port);
-        tty = port->tty;
+        tty = port->port.tty;
 
         if (port->IER & IER_TXEMPTY) {
                 /* FIFO drained */
@@ -811,7 +811,7 @@ static inline void sx_check_modem(struct specialix_board * bp)
         if (!(port = sx_get_port(bp, "Modem")))
                 return;
 
-        tty = port->tty;
+        tty = port->port.tty;
 
         mcr = sx_in(bp, CD186x_MCR);
         printk ("mcr = %02x.\n", mcr);
@@ -821,7 +821,7 @@ static inline void sx_check_modem(struct specialix_board * bp)
                 msvr_cd = sx_in(bp, CD186x_MSVR) & MSVR_CD;
                 if (msvr_cd) {
                         dprintk (SX_DEBUG_SIGNALS, "Waking up guys in open.\n");
-                        wake_up_interruptible(&port->open_wait);
+                        wake_up_interruptible(&port->port.open_wait);
                 } else {
                         dprintk (SX_DEBUG_SIGNALS, "Sending HUP.\n");
                         tty_hangup(tty);
@@ -1030,7 +1030,7 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
 
         func_enter();
 
-        if (!(tty = port->tty) || !tty->termios) {
+        if (!(tty = port->port.tty) || !tty->termios) {
                 func_exit();
                 return;
         }
@@ -1052,9 +1052,9 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
         baud = tty_get_baud_rate(tty);
 
         if (baud == 38400) {
-                if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
                         baud = 57600;
-                if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                if ((port->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
                         baud = 115200;
         }
 
@@ -1244,7 +1244,7 @@ static int sx_setup_port(struct specialix_board *bp, struct specialix_port *port
 
         func_enter();
 
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (port->port.flags & ASYNC_INITIALIZED) {
                 func_exit();
                 return 0;
         }
@@ -1268,12 +1268,12 @@ static int sx_setup_port(struct specialix_board *bp, struct specialix_port *port
 
         spin_lock_irqsave(&port->lock, flags);
 
-        if (port->tty)
-                clear_bit(TTY_IO_ERROR, &port->tty->flags);
+        if (port->port.tty)
+                clear_bit(TTY_IO_ERROR, &port->port.tty->flags);
 
         port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
         sx_change_speed(bp, port);
-        port->flags |= ASYNC_INITIALIZED;
+        port->port.flags |= ASYNC_INITIALIZED;
 
         spin_unlock_irqrestore(&port->lock, flags);
 
@@ -1292,7 +1292,7 @@ static void sx_shutdown_port(struct specialix_board *bp, struct specialix_port *
 
         func_enter();
 
-        if (!(port->flags & ASYNC_INITIALIZED)) {
+        if (!(port->port.flags & ASYNC_INITIALIZED)) {
                 func_exit();
                 return;
         }
@@ -1315,7 +1315,7 @@ static void sx_shutdown_port(struct specialix_board *bp, struct specialix_port *
         spin_lock_irqsave(&bp->lock, flags);
         sx_out(bp, CD186x_CAR, port_No(port));
 
-        if (!(tty = port->tty) || C_HUPCL(tty)) {
+        if (!(tty = port->port.tty) || C_HUPCL(tty)) {
                 /* Drop DTR */
                 sx_out(bp, CD186x_MSVDTR, 0);
         }
@@ -1330,7 +1330,7 @@ static void sx_shutdown_port(struct specialix_board *bp, struct specialix_port *
         spin_unlock_irqrestore(&bp->lock, flags);
         if (tty)
                 set_bit(TTY_IO_ERROR, &tty->flags);
-        port->flags &= ~ASYNC_INITIALIZED;
+        port->port.flags &= ~ASYNC_INITIALIZED;
 
         if (!bp->count)
                 sx_shutdown_board(bp);
@@ -1354,9 +1354,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
          * If the device is in the middle of being closed, then block
          * until it's done, and then try again.
          */
-        if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&port->close_wait);
-                if (port->flags & ASYNC_HUP_NOTIFY) {
+        if (tty_hung_up_p(filp) || port->port.flags & ASYNC_CLOSING) {
+                interruptible_sleep_on(&port->port.close_wait);
+                if (port->port.flags & ASYNC_HUP_NOTIFY) {
                         func_exit();
                         return -EAGAIN;
                 } else {
@@ -1371,7 +1371,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
          */
         if ((filp->f_flags & O_NONBLOCK) ||
             (tty->flags & (1 << TTY_IO_ERROR))) {
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+                port->port.flags |= ASYNC_NORMAL_ACTIVE;
                 func_exit();
                 return 0;
         }
@@ -1387,13 +1387,13 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
          * exit, either normal or abnormal.
          */
         retval = 0;
-        add_wait_queue(&port->open_wait, &wait);
+        add_wait_queue(&port->port.open_wait, &wait);
         spin_lock_irqsave(&port->lock, flags);
         if (!tty_hung_up_p(filp)) {
-                port->count--;
+                port->port.count--;
         }
         spin_unlock_irqrestore(&port->lock, flags);
-        port->blocked_open++;
+        port->port.blocked_open++;
         while (1) {
                 spin_lock_irqsave(&bp->lock, flags);
                 sx_out(bp, CD186x_CAR, port_No(port));
@@ -1410,14 +1410,14 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                 spin_unlock_irqrestore(&bp->lock, flags);
                 set_current_state(TASK_INTERRUPTIBLE);
                 if (tty_hung_up_p(filp) ||
-                    !(port->flags & ASYNC_INITIALIZED)) {
-                        if (port->flags & ASYNC_HUP_NOTIFY)
+                    !(port->port.flags & ASYNC_INITIALIZED)) {
+                        if (port->port.flags & ASYNC_HUP_NOTIFY)
                                 retval = -EAGAIN;
                         else
                                 retval = -ERESTARTSYS;
                         break;
                 }
-                if (!(port->flags & ASYNC_CLOSING) &&
+                if (!(port->port.flags & ASYNC_CLOSING) &&
                     (do_clocal || CD))
                         break;
                 if (signal_pending(current)) {
@@ -1428,19 +1428,19 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
         }
 
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(&port->open_wait, &wait);
+        remove_wait_queue(&port->port.open_wait, &wait);
         spin_lock_irqsave(&port->lock, flags);
         if (!tty_hung_up_p(filp)) {
-                port->count++;
+                port->port.count++;
         }
-        port->blocked_open--;
+        port->port.blocked_open--;
         spin_unlock_irqrestore(&port->lock, flags);
         if (retval) {
                 func_exit();
                 return retval;
         }
 
-        port->flags |= ASYNC_NORMAL_ACTIVE;
+        port->port.flags |= ASYNC_NORMAL_ACTIVE;
         func_exit();
         return 0;
 }
@@ -1484,10 +1484,10 @@ static int sx_open(struct tty_struct * tty, struct file * filp)
         }
 
         spin_lock_irqsave(&bp->lock, flags);
-        port->count++;
+        port->port.count++;
         bp->count++;
         tty->driver_data = port;
-        port->tty = tty;
+        port->port.tty = tty;
         spin_unlock_irqrestore(&bp->lock, flags);
 
         if ((error = sx_setup_port(bp, port))) {
@@ -1547,15 +1547,15 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
         }
 
         bp = port_Board(port);
-        if ((tty->count == 1) && (port->count != 1)) {
+        if ((tty->count == 1) && (port->port.count != 1)) {
                 printk(KERN_ERR "sx%d: sx_close: bad port count;"
                        " tty->count is 1, port count is %d\n",
-                       board_No(bp), port->count);
-                port->count = 1;
+                       board_No(bp), port->port.count);
+                port->port.count = 1;
         }
 
-        if (port->count > 1) {
-                port->count--;
+        if (port->port.count > 1) {
+                port->port.count--;
                 bp->count--;
 
                 spin_unlock_irqrestore(&port->lock, flags);
@@ -1563,7 +1563,7 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
                 func_exit();
                 return;
         }
-        port->flags |= ASYNC_CLOSING;
+        port->port.flags |= ASYNC_CLOSING;
         /*
          * Now we wait for the transmit buffer to clear; and we notify
          * the line discipline to only process XON/XOFF characters.
@@ -1571,8 +1571,8 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
         tty->closing = 1;
         spin_unlock_irqrestore(&port->lock, flags);
         dprintk (SX_DEBUG_OPEN, "Closing\n");
-        if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE) {
-                tty_wait_until_sent(tty, port->closing_wait);
+        if (port->port.closing_wait != ASYNC_CLOSING_WAIT_NONE) {
+                tty_wait_until_sent(tty, port->port.closing_wait);
         }
         /*
          * At this point we stop accepting input.  To do this, we
@@ -1582,7 +1582,7 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
          */
         dprintk (SX_DEBUG_OPEN, "Closed\n");
         port->IER &= ~IER_RXD;
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (port->port.flags & ASYNC_INITIALIZED) {
                 port->IER &= ~IER_TXRDY;
                 port->IER |= IER_TXEMPTY;
                 spin_lock_irqsave(&bp->lock, flags);
@@ -1611,10 +1611,10 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
                        board_No(bp), bp->count, tty->index);
                 bp->count = 0;
         }
-        if (--port->count < 0) {
+        if (--port->port.count < 0) {
                 printk(KERN_ERR "sx%d: sx_close: bad port count for tty%d: %d\n",
-                       board_No(bp), port_No(port), port->count);
-                port->count = 0;
+                       board_No(bp), port_No(port), port->port.count);
+                port->port.count = 0;
         }
 
         sx_shutdown_port(bp, port);
@@ -1622,16 +1622,16 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
         tty_ldisc_flush(tty);
         spin_lock_irqsave(&port->lock, flags);
         tty->closing = 0;
-        port->tty = NULL;
+        port->port.tty = NULL;
         spin_unlock_irqrestore(&port->lock, flags);
-        if (port->blocked_open) {
-                if (port->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs(port->close_delay));
+        if (port->port.blocked_open) {
+                if (port->port.close_delay) {
+                        msleep_interruptible(jiffies_to_msecs(port->port.close_delay));
                 }
-                wake_up_interruptible(&port->open_wait);
+                wake_up_interruptible(&port->port.open_wait);
         }
-        port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&port->close_wait);
+        port->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        wake_up_interruptible(&port->port.close_wait);
 
         func_exit();
 }
@@ -1815,7 +1815,7 @@ static int sx_tiocmget(struct tty_struct *tty, struct file *file)
         dprintk (SX_DEBUG_INIT, "Got msvr[%d] = %02x, car = %d.\n",
                 port_No(port), status, sx_in (bp, CD186x_CAR));
         dprintk (SX_DEBUG_INIT, "sx_port = %p, port = %p\n", sx_port, port);
-        if (SX_CRTSCTS(port->tty)) {
+        if (SX_CRTSCTS(port->port.tty)) {
                 result  = /*   (status & MSVR_RTS) ? */ TIOCM_DTR /* : 0) */
                           |   ((status & MSVR_DTR) ? TIOCM_RTS : 0)
                           |   ((status & MSVR_CD)  ? TIOCM_CAR : 0)
@@ -1857,7 +1857,7 @@ static int sx_tiocmset(struct tty_struct *tty, struct file *file,
    /*   if (set & TIOCM_DTR)
                 port->MSVR |= MSVR_DTR; */
 
-        if (SX_CRTSCTS(port->tty)) {
+        if (SX_CRTSCTS(port->port.tty)) {
                 if (set & TIOCM_RTS)
                         port->MSVR |= MSVR_DTR;
         } else {
@@ -1869,7 +1869,7 @@ static int sx_tiocmset(struct tty_struct *tty, struct file *file,
                 port->MSVR &= ~MSVR_RTS; */
   /*    if (clear & TIOCM_DTR)
                 port->MSVR &= ~MSVR_DTR; */
-        if (SX_CRTSCTS(port->tty)) {
+        if (SX_CRTSCTS(port->port.tty)) {
                 if (clear & TIOCM_RTS)
                         port->MSVR &= ~MSVR_DTR;
         } else {
@@ -1929,27 +1929,27 @@ static inline int sx_set_serial_info(struct specialix_port * port,
 
         lock_kernel();
 
-        change_speed = ((port->flags & ASYNC_SPD_MASK) !=
+        change_speed = ((port->port.flags & ASYNC_SPD_MASK) !=
                         (tmp.flags & ASYNC_SPD_MASK));
         change_speed |= (tmp.custom_divisor != port->custom_divisor);
 
         if (!capable(CAP_SYS_ADMIN)) {
-                if ((tmp.close_delay != port->close_delay) ||
-                    (tmp.closing_wait != port->closing_wait) ||
+                if ((tmp.close_delay != port->port.close_delay) ||
+                    (tmp.closing_wait != port->port.closing_wait) ||
                     ((tmp.flags & ~ASYNC_USR_MASK) !=
-                     (port->flags & ~ASYNC_USR_MASK))) {
+                     (port->port.flags & ~ASYNC_USR_MASK))) {
                         func_exit();
                         unlock_kernel();
                         return -EPERM;
                 }
-                port->flags = ((port->flags & ~ASYNC_USR_MASK) |
+                port->port.flags = ((port->port.flags & ~ASYNC_USR_MASK) |
                                   (tmp.flags & ASYNC_USR_MASK));
                 port->custom_divisor = tmp.custom_divisor;
         } else {
-                port->flags = ((port->flags & ~ASYNC_FLAGS) |
+                port->port.flags = ((port->port.flags & ~ASYNC_FLAGS) |
                                   (tmp.flags & ASYNC_FLAGS));
-                port->close_delay = tmp.close_delay;
-                port->closing_wait = tmp.closing_wait;
+                port->port.close_delay = tmp.close_delay;
+                port->port.closing_wait = tmp.closing_wait;
                 port->custom_divisor = tmp.custom_divisor;
         }
         if (change_speed) {
@@ -1975,10 +1975,10 @@ static inline int sx_get_serial_info(struct specialix_port * port,
         tmp.line = port - sx_port;
         tmp.port = bp->base;
         tmp.irq  = bp->irq;
-        tmp.flags = port->flags;
+        tmp.flags = port->port.flags;
         tmp.baud_base = (SX_OSCFREQ + CD186x_TPC/2) / CD186x_TPC;
-        tmp.close_delay = port->close_delay * HZ/100;
-        tmp.closing_wait = port->closing_wait * HZ/100;
+        tmp.close_delay = port->port.close_delay * HZ/100;
+        tmp.closing_wait = port->port.closing_wait * HZ/100;
         tmp.custom_divisor =  port->custom_divisor;
         tmp.xmit_fifo_size = CD186x_NFIFO;
         unlock_kernel();
@@ -2199,17 +2199,17 @@ static void sx_hangup(struct tty_struct * tty)
 
         sx_shutdown_port(bp, port);
         spin_lock_irqsave(&port->lock, flags);
-        bp->count -= port->count;
+        bp->count -= port->port.count;
         if (bp->count < 0) {
                 printk(KERN_ERR "sx%d: sx_hangup: bad board count: %d port: %d\n",
                         board_No(bp), bp->count, tty->index);
                 bp->count = 0;
         }
-        port->count = 0;
-        port->flags &= ~ASYNC_NORMAL_ACTIVE;
-        port->tty = NULL;
+        port->port.count = 0;
+        port->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        port->port.tty = NULL;
         spin_unlock_irqrestore(&port->lock, flags);
-        wake_up_interruptible(&port->open_wait);
+        wake_up_interruptible(&port->port.open_wait);
 
         func_exit();
 }
@@ -2224,10 +2224,6 @@ static void sx_set_termios(struct tty_struct * tty, struct ktermios * old_termio
         if (sx_paranoia_check(port, tty->name, "sx_set_termios"))
                 return;
 
-        if (tty->termios->c_cflag == old_termios->c_cflag &&
-            tty->termios->c_iflag == old_termios->c_iflag)
-                return;
-
         bp = port_Board(port);
         spin_lock_irqsave(&port->lock, flags);
         sx_change_speed(port_Board(port), port);
@@ -2297,10 +2293,7 @@ static int sx_init_drivers(void)
         memset(sx_port, 0, sizeof(sx_port));
         for (i = 0; i < SX_NPORT * SX_NBOARD; i++) {
                 sx_port[i].magic = SPECIALIX_MAGIC;
-                sx_port[i].close_delay = 50 * HZ/100;
-                sx_port[i].closing_wait = 3000 * HZ/100;
-                init_waitqueue_head(&sx_port[i].open_wait);
-                init_waitqueue_head(&sx_port[i].close_wait);
+                tty_port_init(&sx_port[i].port);
                 spin_lock_init(&sx_port[i].lock);
         }
 
diff --git a/drivers/char/specialix_io8.h b/drivers/char/specialix_io8.h
index 3f2f85bdf516..c63005274d9b 100644
--- a/drivers/char/specialix_io8.h
+++ b/drivers/char/specialix_io8.h
@@ -107,23 +107,17 @@ struct specialix_board {
 
 struct specialix_port {
         int                     magic;
+        struct tty_port         port;
         int                     baud_base;
         int                     flags;
-        struct tty_struct       * tty;
-        int                     count;
-        int                     blocked_open;
         int                     timeout;
-        int                     close_delay;
         unsigned char           * xmit_buf;
         int                     custom_divisor;
         int                     xmit_head;
         int                     xmit_tail;
         int                     xmit_cnt;
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
         short                   wakeup_chars;
         short                   break_length;
-        unsigned short          closing_wait;
         unsigned char           mark_mask;
         unsigned char           IER;
         unsigned char           MSVR;
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index d17be10c5d21..0243efb0be95 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -613,17 +613,17 @@ static void stl_cd_change(struct stlport *portp)
 {
         unsigned int oldsigs = portp->sigs;
 
-        if (!portp->tty)
+        if (!portp->port.tty)
                 return;
 
         portp->sigs = stl_getsignals(portp);
 
         if ((portp->sigs & TIOCM_CD) && ((oldsigs & TIOCM_CD) == 0))
-                wake_up_interruptible(&portp->open_wait);
+                wake_up_interruptible(&portp->port.open_wait);
 
         if ((oldsigs & TIOCM_CD) && ((portp->sigs & TIOCM_CD) == 0))
-                if (portp->flags & ASYNC_CHECK_CD)
-                        tty_hangup(portp->tty);
+                if (portp->port.flags & ASYNC_CHECK_CD)
+                        tty_hangup(portp->port.tty);
 }
 
 /*
@@ -734,11 +734,11 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
  *      On the first open of the device setup the port hardware, and
  *      initialize the per port data structure.
  */
-        portp->tty = tty;
+        portp->port.tty = tty;
         tty->driver_data = portp;
-        portp->refcount++;
+        portp->port.count++;
 
-        if ((portp->flags & ASYNC_INITIALIZED) == 0) {
+        if ((portp->port.flags & ASYNC_INITIALIZED) == 0) {
                 if (!portp->tx.buf) {
                         portp->tx.buf = kmalloc(STL_TXBUFSIZE, GFP_KERNEL);
                         if (!portp->tx.buf)
@@ -752,7 +752,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
                 stl_enablerxtx(portp, 1, 1);
                 stl_startrxtx(portp, 1, 0);
                 clear_bit(TTY_IO_ERROR, &tty->flags);
-                portp->flags |= ASYNC_INITIALIZED;
+                portp->port.flags |= ASYNC_INITIALIZED;
         }
 
 /*
@@ -761,9 +761,9 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
  *      The sleep here does not need interrupt protection since the wakeup
  *      for it is done with the same context.
  */
-        if (portp->flags & ASYNC_CLOSING) {
-                interruptible_sleep_on(&portp->close_wait);
-                if (portp->flags & ASYNC_HUP_NOTIFY)
+        if (portp->port.flags & ASYNC_CLOSING) {
+                interruptible_sleep_on(&portp->port.close_wait);
+                if (portp->port.flags & ASYNC_HUP_NOTIFY)
                         return -EAGAIN;
                 return -ERESTARTSYS;
         }
@@ -777,7 +777,7 @@ static int stl_open(struct tty_struct *tty, struct file *filp)
                 if ((rc = stl_waitcarrier(portp, filp)) != 0)
                         return rc;
 
-        portp->flags |= ASYNC_NORMAL_ACTIVE;
+        portp->port.flags |= ASYNC_NORMAL_ACTIVE;
 
         return 0;
 }
@@ -801,25 +801,25 @@ static int stl_waitcarrier(struct stlport *portp, struct file *filp)
 
         spin_lock_irqsave(&stallion_lock, flags);
 
-        if (portp->tty->termios->c_cflag & CLOCAL)
+        if (portp->port.tty->termios->c_cflag & CLOCAL)
                 doclocal++;
 
         portp->openwaitcnt++;
         if (! tty_hung_up_p(filp))
-                portp->refcount--;
+                portp->port.count--;
 
         for (;;) {
                 /* Takes brd_lock internally */
                 stl_setsignals(portp, 1, 1);
                 if (tty_hung_up_p(filp) ||
-                    ((portp->flags & ASYNC_INITIALIZED) == 0)) {
-                        if (portp->flags & ASYNC_HUP_NOTIFY)
+                    ((portp->port.flags & ASYNC_INITIALIZED) == 0)) {
+                        if (portp->port.flags & ASYNC_HUP_NOTIFY)
                                 rc = -EBUSY;
                         else
                                 rc = -ERESTARTSYS;
                         break;
                 }
-                if (((portp->flags & ASYNC_CLOSING) == 0) &&
+                if (((portp->port.flags & ASYNC_CLOSING) == 0) &&
                     (doclocal || (portp->sigs & TIOCM_CD)))
                         break;
                 if (signal_pending(current)) {
@@ -827,11 +827,11 @@ static int stl_waitcarrier(struct stlport *portp, struct file *filp)
                         break;
                 }
                 /* FIXME */
-                interruptible_sleep_on(&portp->open_wait);
+                interruptible_sleep_on(&portp->port.open_wait);
         }
 
         if (! tty_hung_up_p(filp))
-                portp->refcount++;
+                portp->port.count++;
         portp->openwaitcnt--;
         spin_unlock_irqrestore(&stallion_lock, flags);
 
@@ -904,15 +904,15 @@ static void stl_close(struct tty_struct *tty, struct file *filp)
                 spin_unlock_irqrestore(&stallion_lock, flags);
                 return;
         }
-        if ((tty->count == 1) && (portp->refcount != 1))
-                portp->refcount = 1;
-        if (portp->refcount-- > 1) {
+        if ((tty->count == 1) && (portp->port.count != 1))
+                portp->port.count = 1;
+        if (portp->port.count-- > 1) {
                 spin_unlock_irqrestore(&stallion_lock, flags);
                 return;
         }
 
-        portp->refcount = 0;
-        portp->flags |= ASYNC_CLOSING;
+        portp->port.count = 0;
+        portp->port.flags |= ASYNC_CLOSING;
 
 /*
  *      May want to wait for any data to drain before closing. The BUSY
@@ -930,7 +930,7 @@ static void stl_close(struct tty_struct *tty, struct file *filp)
 
 
         spin_lock_irqsave(&stallion_lock, flags);
-        portp->flags &= ~ASYNC_INITIALIZED;
+        portp->port.flags &= ~ASYNC_INITIALIZED;
         spin_unlock_irqrestore(&stallion_lock, flags);
 
         stl_disableintrs(portp);
@@ -949,16 +949,16 @@ static void stl_close(struct tty_struct *tty, struct file *filp)
         tty_ldisc_flush(tty);
 
         tty->closing = 0;
-        portp->tty = NULL;
+        portp->port.tty = NULL;
 
         if (portp->openwaitcnt) {
                 if (portp->close_delay)
                         msleep_interruptible(jiffies_to_msecs(portp->close_delay));
-                wake_up_interruptible(&portp->open_wait);
+                wake_up_interruptible(&portp->port.open_wait);
         }
 
-        portp->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&portp->close_wait);
+        portp->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        wake_up_interruptible(&portp->port.close_wait);
 }
 
 /*****************************************************************************/
@@ -1153,7 +1153,7 @@ static int stl_getserial(struct stlport *portp, struct serial_struct __user *sp)
         memset(&sio, 0, sizeof(struct serial_struct));
         sio.line = portp->portnr;
         sio.port = portp->ioaddr;
-        sio.flags = portp->flags;
+        sio.flags = portp->port.flags;
         sio.baud_base = portp->baud_base;
         sio.close_delay = portp->close_delay;
         sio.closing_wait = portp->closing_wait;
@@ -1194,17 +1194,17 @@ static int stl_setserial(struct stlport *portp, struct serial_struct __user *sp)
                 if ((sio.baud_base != portp->baud_base) ||
                     (sio.close_delay != portp->close_delay) ||
                     ((sio.flags & ~ASYNC_USR_MASK) !=
-                    (portp->flags & ~ASYNC_USR_MASK)))
+                    (portp->port.flags & ~ASYNC_USR_MASK)))
                         return -EPERM;
         } 
 
-        portp->flags = (portp->flags & ~ASYNC_USR_MASK) |
+        portp->port.flags = (portp->port.flags & ~ASYNC_USR_MASK) |
                 (sio.flags & ASYNC_USR_MASK);
         portp->baud_base = sio.baud_base;
         portp->close_delay = sio.close_delay;
         portp->closing_wait = sio.closing_wait;
         portp->custom_divisor = sio.custom_divisor;
-        stl_setport(portp, portp->tty->termios);
+        stl_setport(portp, portp->port.tty->termios);
         return 0;
 }
 
@@ -1353,7 +1353,7 @@ static void stl_settermios(struct tty_struct *tty, struct ktermios *old)
                 stl_start(tty);
         }
         if (((old->c_cflag & CLOCAL) == 0) && (tiosp->c_cflag & CLOCAL))
-                wake_up_interruptible(&portp->open_wait);
+                wake_up_interruptible(&portp->port.open_wait);
 }
 
 /*****************************************************************************/
@@ -1438,7 +1438,7 @@ static void stl_hangup(struct tty_struct *tty)
         if (portp == NULL)
                 return;
 
-        portp->flags &= ~ASYNC_INITIALIZED;
+        portp->port.flags &= ~ASYNC_INITIALIZED;
         stl_disableintrs(portp);
         if (tty->termios->c_cflag & HUPCL)
                 stl_setsignals(portp, 0, 0);
@@ -1452,10 +1452,10 @@ static void stl_hangup(struct tty_struct *tty)
                 portp->tx.head = NULL;
                 portp->tx.tail = NULL;
         }
-        portp->tty = NULL;
-        portp->flags &= ~ASYNC_NORMAL_ACTIVE;
-        portp->refcount = 0;
-        wake_up_interruptible(&portp->open_wait);
+        portp->port.tty = NULL;
+        portp->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        portp->port.count = 0;
+        wake_up_interruptible(&portp->port.open_wait);
 }
 
 /*****************************************************************************/
@@ -1814,8 +1814,8 @@ static int __devinit stl_initports(struct stlbrd *brdp, struct stlpanel *panelp)
                 portp->baud_base = STL_BAUDBASE;
                 portp->close_delay = STL_CLOSEDELAY;
                 portp->closing_wait = 30 * HZ;
-                init_waitqueue_head(&portp->open_wait);
-                init_waitqueue_head(&portp->close_wait);
+                init_waitqueue_head(&portp->port.open_wait);
+                init_waitqueue_head(&portp->port.close_wait);
                 portp->stats.brd = portp->brdnr;
                 portp->stats.panel = portp->panelnr;
                 portp->stats.port = portp->portnr;
@@ -1840,8 +1840,8 @@ static void stl_cleanup_panels(struct stlbrd *brdp)
                         portp = panelp->ports[k];
                         if (portp == NULL)
                                 continue;
-                        if (portp->tty != NULL)
-                                stl_hangup(portp->tty);
+                        if (portp->port.tty != NULL)
+                                stl_hangup(portp->port.tty);
                         kfree(portp->tx.buf);
                         kfree(portp);
                 }
@@ -2513,7 +2513,7 @@ static int stl_getportstats(struct stlport *portp, comstats_t __user *cp)
         }
 
         portp->stats.state = portp->istate;
-        portp->stats.flags = portp->flags;
+        portp->stats.flags = portp->port.flags;
         portp->stats.hwid = portp->hwid;
 
         portp->stats.ttystate = 0;
@@ -2524,16 +2524,16 @@ static int stl_getportstats(struct stlport *portp, comstats_t __user *cp)
         portp->stats.rxbuffered = 0;
 
         spin_lock_irqsave(&stallion_lock, flags);
-        if (portp->tty != NULL)
-                if (portp->tty->driver_data == portp) {
-                        portp->stats.ttystate = portp->tty->flags;
+        if (portp->port.tty != NULL)
+                if (portp->port.tty->driver_data == portp) {
+                        portp->stats.ttystate = portp->port.tty->flags;
                         /* No longer available as a statistic */
-                        portp->stats.rxbuffered = 1; /*portp->tty->flip.count; */
-                        if (portp->tty->termios != NULL) {
-                                portp->stats.cflags = portp->tty->termios->c_cflag;
-                                portp->stats.iflags = portp->tty->termios->c_iflag;
-                                portp->stats.oflags = portp->tty->termios->c_oflag;
-                                portp->stats.lflags = portp->tty->termios->c_lflag;
+                        portp->stats.rxbuffered = 1; /*portp->port.tty->flip.count; */
+                        if (portp->port.tty->termios != NULL) {
+                                portp->stats.cflags = portp->port.tty->termios->c_cflag;
+                                portp->stats.iflags = portp->port.tty->termios->c_iflag;
+                                portp->stats.oflags = portp->port.tty->termios->c_oflag;
+                                portp->stats.lflags = portp->port.tty->termios->c_lflag;
                         }
                 }
         spin_unlock_irqrestore(&stallion_lock, flags);
@@ -2939,15 +2939,15 @@ static void stl_cd1400setport(struct stlport *portp, struct ktermios *tiosp)
         }
         baudrate = stl_baudrates[baudrate];
         if ((tiosp->c_cflag & CBAUD) == B38400) {
-                if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
                         baudrate = 57600;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
                         baudrate = 115200;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
                         baudrate = 230400;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
                         baudrate = 460800;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
                         baudrate = (portp->baud_base / portp->custom_divisor);
         }
         if (baudrate > STL_CD1400MAXBAUD)
@@ -2969,9 +2969,9 @@ static void stl_cd1400setport(struct stlport *portp, struct ktermios *tiosp)
                 mcor1 |= MCOR1_DCD;
                 mcor2 |= MCOR2_DCD;
                 sreron |= SRER_MODEM;
-                portp->flags |= ASYNC_CHECK_CD;
+                portp->port.flags |= ASYNC_CHECK_CD;
         } else
-                portp->flags &= ~ASYNC_CHECK_CD;
+                portp->port.flags &= ~ASYNC_CHECK_CD;
 
 /*
  *      Setup cd1400 enhanced modes if we can. In particular we want to
@@ -3242,7 +3242,7 @@ static void stl_cd1400flowctrl(struct stlport *portp, int state)
 
         if (portp == NULL)
                 return;
-        tty = portp->tty;
+        tty = portp->port.tty;
         if (tty == NULL)
                 return;
 
@@ -3304,7 +3304,7 @@ static void stl_cd1400sendflow(struct stlport *portp, int state)
 
         if (portp == NULL)
                 return;
-        tty = portp->tty;
+        tty = portp->port.tty;
         if (tty == NULL)
                 return;
 
@@ -3503,8 +3503,8 @@ static void stl_cd1400txisr(struct stlpanel *panelp, int ioaddr)
         if ((len == 0) || ((len < STL_TXBUFLOW) &&
             (test_bit(ASYI_TXLOW, &portp->istate) == 0))) {
                 set_bit(ASYI_TXLOW, &portp->istate);
-                if (portp->tty)
-                        tty_wakeup(portp->tty);
+                if (portp->port.tty)
+                        tty_wakeup(portp->port.tty);
         }
 
         if (len == 0) {
@@ -3568,7 +3568,7 @@ static void stl_cd1400rxisr(struct stlpanel *panelp, int ioaddr)
                 return;
         }
         portp = panelp->ports[(ioack >> 3)];
-        tty = portp->tty;
+        tty = portp->port.tty;
 
         if ((ioack & ACK_TYPMASK) == ACK_TYPRXGOOD) {
                 outb((RDCR + portp->uartaddr), ioaddr);
@@ -3613,7 +3613,7 @@ static void stl_cd1400rxisr(struct stlpanel *panelp, int ioaddr)
                         if (portp->rxmarkmsk & status) {
                                 if (status & ST_BREAK) {
                                         status = TTY_BREAK;
-                                        if (portp->flags & ASYNC_SAK) {
+                                        if (portp->port.flags & ASYNC_SAK) {
                                                 do_SAK(tty);
                                                 BRDENABLE(portp->brdnr, portp->pagenr);
                                         }
@@ -3899,15 +3899,15 @@ static void stl_sc26198setport(struct stlport *portp, struct ktermios *tiosp)
         }
         baudrate = stl_baudrates[baudrate];
         if ((tiosp->c_cflag & CBAUD) == B38400) {
-                if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
                         baudrate = 57600;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
                         baudrate = 115200;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
                         baudrate = 230400;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
                         baudrate = 460800;
-                else if ((portp->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
+                else if ((portp->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
                         baudrate = (portp->baud_base / portp->custom_divisor);
         }
         if (baudrate > STL_SC26198MAXBAUD)
@@ -3922,11 +3922,11 @@ static void stl_sc26198setport(struct stlport *portp, struct ktermios *tiosp)
  *      Check what form of modem signaling is required and set it up.
  */
         if (tiosp->c_cflag & CLOCAL) {
-                portp->flags &= ~ASYNC_CHECK_CD;
+                portp->port.flags &= ~ASYNC_CHECK_CD;
         } else {
                 iopr |= IOPR_DCDCOS;
                 imron |= IR_IOPORT;
-                portp->flags |= ASYNC_CHECK_CD;
+                portp->port.flags |= ASYNC_CHECK_CD;
         }
 
 /*
@@ -4174,7 +4174,7 @@ static void stl_sc26198flowctrl(struct stlport *portp, int state)
 
         if (portp == NULL)
                 return;
-        tty = portp->tty;
+        tty = portp->port.tty;
         if (tty == NULL)
                 return;
 
@@ -4243,7 +4243,7 @@ static void stl_sc26198sendflow(struct stlport *portp, int state)
 
         if (portp == NULL)
                 return;
-        tty = portp->tty;
+        tty = portp->port.tty;
         if (tty == NULL)
                 return;
 
@@ -4421,8 +4421,8 @@ static void stl_sc26198txisr(struct stlport *portp)
         if ((len == 0) || ((len < STL_TXBUFLOW) &&
             (test_bit(ASYI_TXLOW, &portp->istate) == 0))) {
                 set_bit(ASYI_TXLOW, &portp->istate);
-                if (portp->tty)
-                        tty_wakeup(portp->tty);
+                if (portp->port.tty)
+                        tty_wakeup(portp->port.tty);
         }
 
         if (len == 0) {
@@ -4475,7 +4475,7 @@ static void stl_sc26198rxisr(struct stlport *portp, unsigned int iack)
 
         pr_debug("stl_sc26198rxisr(portp=%p,iack=%x)\n", portp, iack);
 
-        tty = portp->tty;
+        tty = portp->port.tty;
         ioaddr = portp->ioaddr;
         outb(GIBCR, (ioaddr + XP_ADDR));
         len = inb(ioaddr + XP_DATA) + 1;
@@ -4527,7 +4527,7 @@ static void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char
         struct tty_struct       *tty;
         unsigned int            ioaddr;
 
-        tty = portp->tty;
+        tty = portp->port.tty;
         ioaddr = portp->ioaddr;
 
         if (status & SR_RXPARITY)
@@ -4544,7 +4544,7 @@ static void stl_sc26198rxbadch(struct stlport *portp, unsigned char status, char
                 if (portp->rxmarkmsk & status) {
                         if (status & SR_RXBREAK) {
                                 status = TTY_BREAK;
-                                if (portp->flags & ASYNC_SAK) {
+                                if (portp->port.flags & ASYNC_SAK) {
                                         do_SAK(tty);
                                         BRDENABLE(portp->brdnr, portp->pagenr);
                                 }
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index b1a7a8cb65ea..d5cffcd6a572 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1,4 +1,3 @@
-
 /* sx.c -- driver for the Specialix SX series cards. 
  *
  *  This driver will also support the older SI, and XIO cards.
@@ -930,7 +929,7 @@ static int sx_set_real_termios(void *ptr)
 
         func_enter2();
 
-        if (!port->gs.tty)
+        if (!port->gs.port.tty)
                 return 0;
 
         /* What is this doing here? -- REW
@@ -941,19 +940,19 @@ static int sx_set_real_termios(void *ptr)
 
         sx_set_baud(port);
 
-#define CFLAG port->gs.tty->termios->c_cflag
+#define CFLAG port->gs.port.tty->termios->c_cflag
         sx_write_channel_byte(port, hi_mr1,
-                        (C_PARENB(port->gs.tty) ? MR1_WITH : MR1_NONE) |
-                        (C_PARODD(port->gs.tty) ? MR1_ODD : MR1_EVEN) |
-                        (C_CRTSCTS(port->gs.tty) ? MR1_RTS_RXFLOW : 0) |
+                        (C_PARENB(port->gs.port.tty) ? MR1_WITH : MR1_NONE) |
+                        (C_PARODD(port->gs.port.tty) ? MR1_ODD : MR1_EVEN) |
+                        (C_CRTSCTS(port->gs.port.tty) ? MR1_RTS_RXFLOW : 0) |
                         (((CFLAG & CSIZE) == CS8) ? MR1_8_BITS : 0) |
                         (((CFLAG & CSIZE) == CS7) ? MR1_7_BITS : 0) |
                         (((CFLAG & CSIZE) == CS6) ? MR1_6_BITS : 0) |
                         (((CFLAG & CSIZE) == CS5) ? MR1_5_BITS : 0));
 
         sx_write_channel_byte(port, hi_mr2,
-                        (C_CRTSCTS(port->gs.tty) ? MR2_CTS_TXFLOW : 0) |
-                        (C_CSTOPB(port->gs.tty) ? MR2_2_STOP :
+                        (C_CRTSCTS(port->gs.port.tty) ? MR2_CTS_TXFLOW : 0) |
+                        (C_CSTOPB(port->gs.port.tty) ? MR2_2_STOP :
                         MR2_1_STOP));
 
         switch (CFLAG & CSIZE) {
@@ -976,44 +975,44 @@ static int sx_set_real_termios(void *ptr)
         }
 
         sx_write_channel_byte(port, hi_prtcl,
-                        (I_IXON(port->gs.tty) ? SP_TXEN : 0) |
-                        (I_IXOFF(port->gs.tty) ? SP_RXEN : 0) |
-                        (I_IXANY(port->gs.tty) ? SP_TANY : 0) | SP_DCEN);
+                        (I_IXON(port->gs.port.tty) ? SP_TXEN : 0) |
+                        (I_IXOFF(port->gs.port.tty) ? SP_RXEN : 0) |
+                        (I_IXANY(port->gs.port.tty) ? SP_TANY : 0) | SP_DCEN);
 
         sx_write_channel_byte(port, hi_break,
-                        (I_IGNBRK(port->gs.tty) ? BR_IGN : 0 |
-                        I_BRKINT(port->gs.tty) ? BR_INT : 0));
+                        (I_IGNBRK(port->gs.port.tty) ? BR_IGN : 0 |
+                        I_BRKINT(port->gs.port.tty) ? BR_INT : 0));
 
-        sx_write_channel_byte(port, hi_txon, START_CHAR(port->gs.tty));
-        sx_write_channel_byte(port, hi_rxon, START_CHAR(port->gs.tty));
-        sx_write_channel_byte(port, hi_txoff, STOP_CHAR(port->gs.tty));
-        sx_write_channel_byte(port, hi_rxoff, STOP_CHAR(port->gs.tty));
+        sx_write_channel_byte(port, hi_txon, START_CHAR(port->gs.port.tty));
+        sx_write_channel_byte(port, hi_rxon, START_CHAR(port->gs.port.tty));
+        sx_write_channel_byte(port, hi_txoff, STOP_CHAR(port->gs.port.tty));
+        sx_write_channel_byte(port, hi_rxoff, STOP_CHAR(port->gs.port.tty));
 
         sx_reconfigure_port(port);
 
         /* Tell line discipline whether we will do input cooking */
-        if (I_OTHER(port->gs.tty)) {
-                clear_bit(TTY_HW_COOK_IN, &port->gs.tty->flags);
+        if (I_OTHER(port->gs.port.tty)) {
+                clear_bit(TTY_HW_COOK_IN, &port->gs.port.tty->flags);
         } else {
-                set_bit(TTY_HW_COOK_IN, &port->gs.tty->flags);
+                set_bit(TTY_HW_COOK_IN, &port->gs.port.tty->flags);
         }
         sx_dprintk(SX_DEBUG_TERMIOS, "iflags: %x(%d) ",
-                        (unsigned int)port->gs.tty->termios->c_iflag,
-                        I_OTHER(port->gs.tty));
+                        (unsigned int)port->gs.port.tty->termios->c_iflag,
+                        I_OTHER(port->gs.port.tty));
 
 /* Tell line discipline whether we will do output cooking.
  * If OPOST is set and no other output flags are set then we can do output
  * processing.  Even if only *one* other flag in the O_OTHER group is set
  * we do cooking in software.
  */
-        if (O_OPOST(port->gs.tty) && !O_OTHER(port->gs.tty)) {
-                set_bit(TTY_HW_COOK_OUT, &port->gs.tty->flags);
+        if (O_OPOST(port->gs.port.tty) && !O_OTHER(port->gs.port.tty)) {
+                set_bit(TTY_HW_COOK_OUT, &port->gs.port.tty->flags);
         } else {
-                clear_bit(TTY_HW_COOK_OUT, &port->gs.tty->flags);
+                clear_bit(TTY_HW_COOK_OUT, &port->gs.port.tty->flags);
         }
         sx_dprintk(SX_DEBUG_TERMIOS, "oflags: %x(%d)\n",
-                        (unsigned int)port->gs.tty->termios->c_oflag,
-                        O_OTHER(port->gs.tty));
+                        (unsigned int)port->gs.port.tty->termios->c_oflag,
+                        O_OTHER(port->gs.port.tty));
         /* port->c_dcd = sx_get_CD (port); */
         func_exit();
         return 0;
@@ -1102,8 +1101,8 @@ static void sx_transmit_chars(struct sx_port *port)
                 sx_disable_tx_interrupts(port);
         }
 
-        if ((port->gs.xmit_cnt <= port->gs.wakeup_chars) && port->gs.tty) {
-                tty_wakeup(port->gs.tty);
+        if ((port->gs.xmit_cnt <= port->gs.wakeup_chars) && port->gs.port.tty) {
+                tty_wakeup(port->gs.port.tty);
                 sx_dprintk(SX_DEBUG_TRANSMIT, "Waking up.... ldisc (%d)....\n",
                                 port->gs.wakeup_chars);
         }
@@ -1126,7 +1125,7 @@ static inline void sx_receive_chars(struct sx_port *port)
         unsigned char *rp;
 
         func_enter2();
-        tty = port->gs.tty;
+        tty = port->gs.port.tty;
         while (1) {
                 rx_op = sx_read_channel_byte(port, hi_rxopos);
                 c = (sx_read_channel_byte(port, hi_rxipos) - rx_op) & 0xff;
@@ -1211,12 +1210,12 @@ static inline void sx_check_modem_signals(struct sx_port *port)
                                 /* DCD went UP */
                                 if ((sx_read_channel_byte(port, hi_hstat) !=
                                                 HS_IDLE_CLOSED) &&
-                                                !(port->gs.tty->termios->
+                                                !(port->gs.port.tty->termios->
                                                         c_cflag & CLOCAL)) {
                                         /* Are we blocking in open? */
                                         sx_dprintk(SX_DEBUG_MODEMSIGNALS, "DCD "
                                                 "active, unblocking open\n");
-                                        wake_up_interruptible(&port->gs.
+                                        wake_up_interruptible(&port->gs.port.
                                                         open_wait);
                                 } else {
                                         sx_dprintk(SX_DEBUG_MODEMSIGNALS, "DCD "
@@ -1224,10 +1223,10 @@ static inline void sx_check_modem_signals(struct sx_port *port)
                                 }
                         } else {
                                 /* DCD went down! */
-                                if (!(port->gs.tty->termios->c_cflag & CLOCAL)){
+                                if (!(port->gs.port.tty->termios->c_cflag & CLOCAL)){
                                         sx_dprintk(SX_DEBUG_MODEMSIGNALS, "DCD "
                                                 "dropped. hanging up....\n");
-                                        tty_hangup(port->gs.tty);
+                                        tty_hangup(port->gs.port.tty);
                                 } else {
                                         sx_dprintk(SX_DEBUG_MODEMSIGNALS, "DCD "
                                                 "dropped. ignoring.\n");
@@ -1325,7 +1324,7 @@ static irqreturn_t sx_interrupt(int irq, void *ptr)
 
         for (i = 0; i < board->nports; i++) {
                 port = &board->ports[i];
-                if (port->gs.flags & GS_ACTIVE) {
+                if (port->gs.port.flags & GS_ACTIVE) {
                         if (sx_read_channel_byte(port, hi_state)) {
                                 sx_dprintk(SX_DEBUG_INTERRUPTS, "Port %d: "
                                                 "modem signal change?... \n",i);
@@ -1334,7 +1333,7 @@ static irqreturn_t sx_interrupt(int irq, void *ptr)
                         if (port->gs.xmit_cnt) {
                                 sx_transmit_chars(port);
                         }
-                        if (!(port->gs.flags & SX_RX_THROTTLE)) {
+                        if (!(port->gs.port.flags & SX_RX_THROTTLE)) {
                                 sx_receive_chars(port);
                         }
                 }
@@ -1373,7 +1372,7 @@ static void sx_disable_tx_interrupts(void *ptr)
         struct sx_port *port = ptr;
         func_enter2();
 
-        port->gs.flags &= ~GS_TX_INTEN;
+        port->gs.port.flags &= ~GS_TX_INTEN;
 
         func_exit();
 }
@@ -1394,7 +1393,7 @@ static void sx_enable_tx_interrupts(void *ptr)
 
         /* XXX Must be "HIGH_WATER" for SI card according to doc. */
         if (data_in_buffer < LOW_WATER)
-                port->gs.flags &= ~GS_TX_INTEN;
+                port->gs.port.flags &= ~GS_TX_INTEN;
 
         func_exit();
 }
@@ -1442,8 +1441,8 @@ static void sx_shutdown_port(void *ptr)
 
         func_enter();
 
-        port->gs.flags &= ~GS_ACTIVE;
-        if (port->gs.tty && (port->gs.tty->termios->c_cflag & HUPCL)) {
+        port->gs.port.flags &= ~GS_ACTIVE;
+        if (port->gs.port.tty && (port->gs.port.tty->termios->c_cflag & HUPCL)) {
                 sx_setsignals(port, 0, 0);
                 sx_reconfigure_port(port);
         }
@@ -1485,8 +1484,8 @@ static int sx_open(struct tty_struct *tty, struct file *filp)
         spin_lock_irqsave(&port->gs.driver_lock, flags);
 
         tty->driver_data = port;
-        port->gs.tty = tty;
-        port->gs.count++;
+        port->gs.port.tty = tty;
+        port->gs.port.count++;
         spin_unlock_irqrestore(&port->gs.driver_lock, flags);
 
         sx_dprintk(SX_DEBUG_OPEN, "starting port\n");
@@ -1497,12 +1496,12 @@ static int sx_open(struct tty_struct *tty, struct file *filp)
         retval = gs_init_port(&port->gs);
         sx_dprintk(SX_DEBUG_OPEN, "done gs_init\n");
         if (retval) {
-                port->gs.count--;
+                port->gs.port.count--;
                 return retval;
         }
 
-        port->gs.flags |= GS_ACTIVE;
-        if (port->gs.count <= 1)
+        port->gs.port.flags |= GS_ACTIVE;
+        if (port->gs.port.count <= 1)
                 sx_setsignals(port, 1, 1);
 
 #if 0
@@ -1513,12 +1512,12 @@ static int sx_open(struct tty_struct *tty, struct file *filp)
                 my_hd_io(port->board->base + port->ch_base, sizeof(*port));
 #endif
 
-        if (port->gs.count <= 1) {
+        if (port->gs.port.count <= 1) {
                 if (sx_send_command(port, HS_LOPEN, -1, HS_IDLE_OPEN) != 1) {
                         printk(KERN_ERR "sx: Card didn't respond to LOPEN "
                                         "command.\n");
                         spin_lock_irqsave(&port->gs.driver_lock, flags);
-                        port->gs.count--;
+                        port->gs.port.count--;
                         spin_unlock_irqrestore(&port->gs.driver_lock, flags);
                         return -EIO;
                 }
@@ -1526,11 +1525,11 @@ static int sx_open(struct tty_struct *tty, struct file *filp)
 
         retval = gs_block_til_ready(port, filp);
         sx_dprintk(SX_DEBUG_OPEN, "Block til ready returned %d. Count=%d\n",
-                        retval, port->gs.count);
+                        retval, port->gs.port.count);
 
         if (retval) {
 /*
- * Don't lower gs.count here because sx_close() will be called later
+ * Don't lower gs.port.count here because sx_close() will be called later
  */
 
                 return retval;
@@ -1571,14 +1570,14 @@ static void sx_close(void *ptr)
         }
 
         sx_dprintk(SX_DEBUG_CLOSE, "waited %d jiffies for close. count=%d\n",
-                        5 * HZ - to - 1, port->gs.count);
+                        5 * HZ - to - 1, port->gs.port.count);
 
-        if (port->gs.count) {
+        if (port->gs.port.count) {
                 sx_dprintk(SX_DEBUG_CLOSE, "WARNING port count:%d\n",
-                                port->gs.count);
+                                port->gs.port.count);
                 /*printk("%s SETTING port count to zero: %p count: %d\n",
-                                __func__, port, port->gs.count);
-                port->gs.count = 0;*/
+                                __func__, port, port->gs.port.count);
+                port->gs.port.count = 0;*/
         }
 
         func_exit();
@@ -1939,7 +1938,7 @@ static void sx_throttle(struct tty_struct *tty)
          * control then throttle the port.
          */
         if ((tty->termios->c_cflag & CRTSCTS) || (I_IXOFF(tty))) {
-                port->gs.flags |= SX_RX_THROTTLE;
+                port->gs.port.flags |= SX_RX_THROTTLE;
         }
         func_exit();
 }
@@ -1953,7 +1952,7 @@ static void sx_unthrottle(struct tty_struct *tty)
          * this port in case we disabled flow control while the port
          * was throttled
          */
-        port->gs.flags &= ~SX_RX_THROTTLE;
+        port->gs.port.flags &= ~SX_RX_THROTTLE;
         func_exit();
         return;
 }
@@ -2396,6 +2395,7 @@ static int sx_init_portstructs(int nboards, int nports)
                 board->ports = port;
                 for (j = 0; j < boards[i].nports; j++) {
                         sx_dprintk(SX_DEBUG_INIT, "initing port %d\n", j);
+                        tty_port_init(&port->gs.port);
                         port->gs.magic = SX_MAGIC;
                         port->gs.close_delay = HZ / 2;
                         port->gs.closing_wait = 30 * HZ;
@@ -2408,9 +2408,6 @@ static int sx_init_portstructs(int nboards, int nports)
                         /*
                          * Initializing wait queue
                          */
-                        init_waitqueue_head(&port->gs.open_wait);
-                        init_waitqueue_head(&port->gs.close_wait);
-
                         port++;
                 }
         }
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 9d247d8a87a3..527d220aa4aa 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -180,19 +180,14 @@ struct tx_holding_buffer {
  
 struct mgsl_struct {
         int                     magic;
-        int                     flags;
-        int                     count;          /* count of opens */
+        struct tty_port         port;
         int                     line;
         int                     hw_version;
-        unsigned short          close_delay;
-        unsigned short          closing_wait;   /* time to wait before closing */
         
         struct mgsl_icount      icount;
         
-        struct tty_struct       *tty;
         int                     timeout;
         int                     x_char;         /* xon/xoff character */
-        int                     blocked_open;   /* # of blocked opens */
         u16                     read_status_mask;
         u16                     ignore_status_mask;     
         unsigned char           *xmit_buf;
@@ -200,9 +195,6 @@ struct mgsl_struct {
         int                     xmit_tail;
         int                     xmit_cnt;
         
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
-        
         wait_queue_head_t       status_event_wait_q;
         wait_queue_head_t       event_wait_q;
         struct timer_list       tx_timer;       /* HDLC transmit timeout timer */
@@ -975,8 +967,8 @@ static void ldisc_receive_buf(struct tty_struct *tty,
                 return;
         ld = tty_ldisc_ref(tty);
         if (ld) {
-                if (ld->receive_buf)
-                        ld->receive_buf(tty, data, flags, count);
+                if (ld->ops->receive_buf)
+                        ld->ops->receive_buf(tty, data, flags, count);
                 tty_ldisc_deref(ld);
         }
 }
@@ -1134,7 +1126,7 @@ static void mgsl_bh_receive(struct mgsl_struct *info)
 
 static void mgsl_bh_transmit(struct mgsl_struct *info)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         unsigned long flags;
         
         if ( debug_level >= DEBUG_LEVEL_BH )
@@ -1276,7 +1268,7 @@ static void mgsl_isr_transmit_status( struct mgsl_struct *info )
         else 
 #endif
         {
-                if (info->tty->stopped || info->tty->hw_stopped) {
+                if (info->port.tty->stopped || info->port.tty->hw_stopped) {
                         usc_stop_transmitter(info);
                         return;
                 }
@@ -1357,29 +1349,29 @@ static void mgsl_isr_io_pin( struct mgsl_struct *info )
                 wake_up_interruptible(&info->status_event_wait_q);
                 wake_up_interruptible(&info->event_wait_q);
 
-                if ( (info->flags & ASYNC_CHECK_CD) && 
+                if ( (info->port.flags & ASYNC_CHECK_CD) && 
                      (status & MISCSTATUS_DCD_LATCHED) ) {
                         if ( debug_level >= DEBUG_LEVEL_ISR )
                                 printk("%s CD now %s...", info->device_name,
                                        (status & MISCSTATUS_DCD) ? "on" : "off");
                         if (status & MISCSTATUS_DCD)
-                                wake_up_interruptible(&info->open_wait);
+                                wake_up_interruptible(&info->port.open_wait);
                         else {
                                 if ( debug_level >= DEBUG_LEVEL_ISR )
                                         printk("doing serial hangup...");
-                                if (info->tty)
-                                        tty_hangup(info->tty);
+                                if (info->port.tty)
+                                        tty_hangup(info->port.tty);
                         }
                 }
         
-                if ( (info->flags & ASYNC_CTS_FLOW) && 
+                if ( (info->port.flags & ASYNC_CTS_FLOW) && 
                      (status & MISCSTATUS_CTS_LATCHED) ) {
-                        if (info->tty->hw_stopped) {
+                        if (info->port.tty->hw_stopped) {
                                 if (status & MISCSTATUS_CTS) {
                                         if ( debug_level >= DEBUG_LEVEL_ISR )
                                                 printk("CTS tx start...");
-                                        if (info->tty)
-                                                info->tty->hw_stopped = 0;
+                                        if (info->port.tty)
+                                                info->port.tty->hw_stopped = 0;
                                         usc_start_transmitter(info);
                                         info->pending_bh |= BH_TRANSMIT;
                                         return;
@@ -1388,8 +1380,8 @@ static void mgsl_isr_io_pin( struct mgsl_struct *info )
                                 if (!(status & MISCSTATUS_CTS)) {
                                         if ( debug_level >= DEBUG_LEVEL_ISR )
                                                 printk("CTS tx stop...");
-                                        if (info->tty)
-                                                info->tty->hw_stopped = 1;
+                                        if (info->port.tty)
+                                                info->port.tty->hw_stopped = 1;
                                         usc_stop_transmitter(info);
                                 }
                         }
@@ -1423,7 +1415,7 @@ static void mgsl_isr_transmit_data( struct mgsl_struct *info )
                         
         usc_ClearIrqPendingBits( info, TRANSMIT_DATA );
         
-        if (info->tty->stopped || info->tty->hw_stopped) {
+        if (info->port.tty->stopped || info->port.tty->hw_stopped) {
                 usc_stop_transmitter(info);
                 return;
         }
@@ -1453,7 +1445,7 @@ static void mgsl_isr_receive_data( struct mgsl_struct *info )
         u16 status;
         int work = 0;
         unsigned char DataByte;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         struct  mgsl_icount *icount = &info->icount;
         
         if ( debug_level >= DEBUG_LEVEL_ISR )   
@@ -1514,7 +1506,7 @@ static void mgsl_isr_receive_data( struct mgsl_struct *info )
                 
                         if (status & RXSTATUS_BREAK_RECEIVED) {
                                 flag = TTY_BREAK;
-                                if (info->flags & ASYNC_SAK)
+                                if (info->port.flags & ASYNC_SAK)
                                         do_SAK(tty);
                         } else if (status & RXSTATUS_PARITY_ERROR)
                                 flag = TTY_PARITY;
@@ -1771,7 +1763,7 @@ static int startup(struct mgsl_struct * info)
         if ( debug_level >= DEBUG_LEVEL_INFO )
                 printk("%s(%d):mgsl_startup(%s)\n",__FILE__,__LINE__,info->device_name);
                 
-        if (info->flags & ASYNC_INITIALIZED)
+        if (info->port.flags & ASYNC_INITIALIZED)
                 return 0;
         
         if (!info->xmit_buf) {
@@ -1798,8 +1790,8 @@ static int startup(struct mgsl_struct * info)
                 retval = mgsl_adapter_test(info);
                 
         if ( retval ) {
-                if (capable(CAP_SYS_ADMIN) && info->tty)
-                        set_bit(TTY_IO_ERROR, &info->tty->flags);
+                if (capable(CAP_SYS_ADMIN) && info->port.tty)
+                        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
                 mgsl_release_resources(info);
                 return retval;
         }
@@ -1807,10 +1799,10 @@ static int startup(struct mgsl_struct * info)
         /* program hardware for current parameters */
         mgsl_change_params(info);
         
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-        info->flags |= ASYNC_INITIALIZED;
+        info->port.flags |= ASYNC_INITIALIZED;
         
         return 0;
         
@@ -1827,7 +1819,7 @@ static void shutdown(struct mgsl_struct * info)
 {
         unsigned long flags;
         
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 return;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -1864,7 +1856,7 @@ static void shutdown(struct mgsl_struct * info)
         /* on the ISA adapter. This has no effect for the PCI adapter */
         usc_OutReg(info, PCR, (u16)((usc_InReg(info, PCR) | BIT13) | BIT12));
         
-        if (!info->tty || info->tty->termios->c_cflag & HUPCL) {
+        if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) {
                 info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
                 usc_set_serial_signals(info);
         }
@@ -1873,10 +1865,10 @@ static void shutdown(struct mgsl_struct * info)
 
         mgsl_release_resources(info);   
         
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-        info->flags &= ~ASYNC_INITIALIZED;
+        info->port.flags &= ~ASYNC_INITIALIZED;
         
 }       /* end of shutdown() */
 
@@ -1908,7 +1900,7 @@ static void mgsl_program_hw(struct mgsl_struct *info)
         usc_EnableInterrupts(info, IO_PIN);
         usc_get_serial_signals(info);
                 
-        if (info->netcount || info->tty->termios->c_cflag & CREAD)
+        if (info->netcount || info->port.tty->termios->c_cflag & CREAD)
                 usc_start_receiver(info);
                 
         spin_unlock_irqrestore(&info->irq_spinlock,flags);
@@ -1921,14 +1913,14 @@ static void mgsl_change_params(struct mgsl_struct *info)
         unsigned cflag;
         int bits_per_char;
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
                 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):mgsl_change_params(%s)\n",
                          __FILE__,__LINE__, info->device_name );
                          
-        cflag = info->tty->termios->c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
 
         /* if B0 rate (hangup) specified then negate DTR and RTS */
         /* otherwise assert DTR and RTS */
@@ -1976,7 +1968,7 @@ static void mgsl_change_params(struct mgsl_struct *info)
          * current data rate.
          */
         if (info->params.data_rate <= 460800)
-                info->params.data_rate = tty_get_baud_rate(info->tty);
+                info->params.data_rate = tty_get_baud_rate(info->port.tty);
         
         if ( info->params.data_rate ) {
                 info->timeout = (32*HZ*bits_per_char) / 
@@ -1985,31 +1977,31 @@ static void mgsl_change_params(struct mgsl_struct *info)
         info->timeout += HZ/50;         /* Add .02 seconds of slop */
 
         if (cflag & CRTSCTS)
-                info->flags |= ASYNC_CTS_FLOW;
+                info->port.flags |= ASYNC_CTS_FLOW;
         else
-                info->flags &= ~ASYNC_CTS_FLOW;
+                info->port.flags &= ~ASYNC_CTS_FLOW;
                 
         if (cflag & CLOCAL)
-                info->flags &= ~ASYNC_CHECK_CD;
+                info->port.flags &= ~ASYNC_CHECK_CD;
         else
-                info->flags |= ASYNC_CHECK_CD;
+                info->port.flags |= ASYNC_CHECK_CD;
 
         /* process tty input control flags */
         
         info->read_status_mask = RXSTATUS_OVERRUN;
-        if (I_INPCK(info->tty))
+        if (I_INPCK(info->port.tty))
                 info->read_status_mask |= RXSTATUS_PARITY_ERROR | RXSTATUS_FRAMING_ERROR;
-        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
+        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
                 info->read_status_mask |= RXSTATUS_BREAK_RECEIVED;
         
-        if (I_IGNPAR(info->tty))
+        if (I_IGNPAR(info->port.tty))
                 info->ignore_status_mask |= RXSTATUS_PARITY_ERROR | RXSTATUS_FRAMING_ERROR;
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(info->port.tty)) {
                 info->ignore_status_mask |= RXSTATUS_BREAK_RECEIVED;
                 /* If ignoring parity and break indicators, ignore 
                  * overruns too.  (For real raw support).
                  */
-                if (I_IGNPAR(info->tty))
+                if (I_IGNPAR(info->port.tty))
                         info->ignore_status_mask |= RXSTATUS_OVERRUN;
         }
 
@@ -3113,32 +3105,32 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
         
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
-                         __FILE__,__LINE__, info->device_name, info->count);
+                         __FILE__,__LINE__, info->device_name, info->port.count);
                          
-        if (!info->count)
+        if (!info->port.count)
                 return;
 
         if (tty_hung_up_p(filp))
                 goto cleanup;
                         
-        if ((tty->count == 1) && (info->count != 1)) {
+        if ((tty->count == 1) && (info->port.count != 1)) {
                 /*
                  * tty->count is 1 and the tty structure will be freed.
-                 * info->count should be one in this case.
+                 * info->port.count should be one in this case.
                  * if it's not, correct it so that the port is shutdown.
                  */
                 printk("mgsl_close: bad refcount; tty->count is 1, "
-                       "info->count is %d\n", info->count);
-                info->count = 1;
+                       "info->port.count is %d\n", info->port.count);
+                info->port.count = 1;
         }
         
-        info->count--;
+        info->port.count--;
         
         /* if at least one open remaining, leave hardware active */
-        if (info->count)
+        if (info->port.count)
                 goto cleanup;
         
-        info->flags |= ASYNC_CLOSING;
+        info->port.flags |= ASYNC_CLOSING;
         
         /* set tty->closing to notify line discipline to 
          * only process XON/XOFF characters. Only the N_TTY
@@ -3148,14 +3140,14 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
         
         /* wait for transmit data to clear all layers */
         
-        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE) {
+        if (info->port.closing_wait != ASYNC_CLOSING_WAIT_NONE) {
                 if (debug_level >= DEBUG_LEVEL_INFO)
                         printk("%s(%d):mgsl_close(%s) calling tty_wait_until_sent\n",
                                  __FILE__,__LINE__, info->device_name );
-                tty_wait_until_sent(tty, info->closing_wait);
+                tty_wait_until_sent(tty, info->port.closing_wait);
         }
                 
-        if (info->flags & ASYNC_INITIALIZED)
+        if (info->port.flags & ASYNC_INITIALIZED)
                 mgsl_wait_until_sent(tty, info->timeout);
 
         mgsl_flush_buffer(tty);
@@ -3165,23 +3157,23 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
         shutdown(info);
         
         tty->closing = 0;
-        info->tty = NULL;
+        info->port.tty = NULL;
         
-        if (info->blocked_open) {
-                if (info->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
+        if (info->port.blocked_open) {
+                if (info->port.close_delay) {
+                        msleep_interruptible(jiffies_to_msecs(info->port.close_delay));
                 }
-                wake_up_interruptible(&info->open_wait);
+                wake_up_interruptible(&info->port.open_wait);
         }
         
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        info->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
                          
-        wake_up_interruptible(&info->close_wait);
+        wake_up_interruptible(&info->port.close_wait);
         
 cleanup:                        
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
-                        tty->driver->name, info->count);
+                        tty->driver->name, info->port.count);
                         
 }       /* end of mgsl_close() */
 
@@ -3211,7 +3203,7 @@ static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout)
         if (mgsl_paranoia_check(info, tty->name, "mgsl_wait_until_sent"))
                 return;
 
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 goto exit;
          
         orig_jiffies = jiffies;
@@ -3283,11 +3275,11 @@ static void mgsl_hangup(struct tty_struct *tty)
         mgsl_flush_buffer(tty);
         shutdown(info);
         
-        info->count = 0;        
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = NULL;
+        info->port.count = 0;   
+        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->port.tty = NULL;
 
-        wake_up_interruptible(&info->open_wait);
+        wake_up_interruptible(&info->port.open_wait);
         
 }       /* end of mgsl_hangup() */
 
@@ -3319,7 +3311,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
 
         if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
                 /* nonblock mode is set or port is not enabled */
-                info->flags |= ASYNC_NORMAL_ACTIVE;
+                info->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
 
@@ -3328,25 +3320,25 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
 
         /* Wait for carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
-         * this loop, info->count is dropped by one, so that
+         * this loop, info->port.count is dropped by one, so that
          * mgsl_close() knows when to free things.  We restore it upon
          * exit, either normal or abnormal.
          */
          
         retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
+        add_wait_queue(&info->port.open_wait, &wait);
         
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):block_til_ready before block on %s count=%d\n",
-                         __FILE__,__LINE__, tty->driver->name, info->count );
+                         __FILE__,__LINE__, tty->driver->name, info->port.count );
 
         spin_lock_irqsave(&info->irq_spinlock, flags);
         if (!tty_hung_up_p(filp)) {
                 extra_count = true;
-                info->count--;
+                info->port.count--;
         }
         spin_unlock_irqrestore(&info->irq_spinlock, flags);
-        info->blocked_open++;
+        info->port.blocked_open++;
         
         while (1) {
                 if (tty->termios->c_cflag & CBAUD) {
@@ -3358,8 +3350,8 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                 
                 set_current_state(TASK_INTERRUPTIBLE);
                 
-                if (tty_hung_up_p(filp) || !(info->flags & ASYNC_INITIALIZED)){
-                        retval = (info->flags & ASYNC_HUP_NOTIFY) ?
+                if (tty_hung_up_p(filp) || !(info->port.flags & ASYNC_INITIALIZED)){
+                        retval = (info->port.flags & ASYNC_HUP_NOTIFY) ?
                                         -EAGAIN : -ERESTARTSYS;
                         break;
                 }
@@ -3368,7 +3360,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                 usc_get_serial_signals(info);
                 spin_unlock_irqrestore(&info->irq_spinlock,flags);
                 
-                if (!(info->flags & ASYNC_CLOSING) &&
+                if (!(info->port.flags & ASYNC_CLOSING) &&
                     (do_clocal || (info->serial_signals & SerialSignal_DCD)) ) {
                         break;
                 }
@@ -3380,24 +3372,24 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                 
                 if (debug_level >= DEBUG_LEVEL_INFO)
                         printk("%s(%d):block_til_ready blocking on %s count=%d\n",
-                                 __FILE__,__LINE__, tty->driver->name, info->count );
+                                 __FILE__,__LINE__, tty->driver->name, info->port.count );
                                  
                 schedule();
         }
         
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
+        remove_wait_queue(&info->port.open_wait, &wait);
         
         if (extra_count)
-                info->count++;
-        info->blocked_open--;
+                info->port.count++;
+        info->port.blocked_open--;
         
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
-                         __FILE__,__LINE__, tty->driver->name, info->count );
+                         __FILE__,__LINE__, tty->driver->name, info->port.count );
                          
         if (!retval)
-                info->flags |= ASYNC_NORMAL_ACTIVE;
+                info->port.flags |= ASYNC_NORMAL_ACTIVE;
                 
         return retval;
         
@@ -3435,22 +3427,22 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
                 return -ENODEV;
         
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
                 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
-                         __FILE__,__LINE__,tty->driver->name, info->count);
+                         __FILE__,__LINE__,tty->driver->name, info->port.count);
 
         /* If port is closing, signal caller to try again */
-        if (tty_hung_up_p(filp) || info->flags & ASYNC_CLOSING){
-                if (info->flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->close_wait);
-                retval = ((info->flags & ASYNC_HUP_NOTIFY) ?
+        if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
+                if (info->port.flags & ASYNC_CLOSING)
+                        interruptible_sleep_on(&info->port.close_wait);
+                retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
                         -EAGAIN : -ERESTARTSYS);
                 goto cleanup;
         }
         
-        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        info->port.tty->low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         spin_lock_irqsave(&info->netlock, flags);
         if (info->netcount) {
@@ -3458,10 +3450,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
                 spin_unlock_irqrestore(&info->netlock, flags);
                 goto cleanup;
         }
-        info->count++;
+        info->port.count++;
         spin_unlock_irqrestore(&info->netlock, flags);
 
-        if (info->count == 1) {
+        if (info->port.count == 1) {
                 /* 1st open on this device, init hardware */
                 retval = startup(info);
                 if (retval < 0)
@@ -3484,9 +3476,9 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
 cleanup:                        
         if (retval) {
                 if (tty->count == 1)
-                        info->tty = NULL; /* tty layer will release tty struct */
-                if(info->count)
-                        info->count--;
+                        info->port.tty = NULL; /* tty layer will release tty struct */
+                if(info->port.count)
+                        info->port.count--;
         }
         
         return retval;
@@ -4332,13 +4324,12 @@ static struct mgsl_struct* mgsl_allocate_device(void)
         if (!info) {
                 printk("Error can't allocate device instance data\n");
         } else {
+                tty_port_init(&info->port);
                 info->magic = MGSL_MAGIC;
                 INIT_WORK(&info->task, mgsl_bh_handler);
                 info->max_frame_size = 4096;
-                info->close_delay = 5*HZ/10;
-                info->closing_wait = 30*HZ;
-                init_waitqueue_head(&info->open_wait);
-                init_waitqueue_head(&info->close_wait);
+                info->port.close_delay = 5*HZ/10;
+                info->port.closing_wait = 30*HZ;
                 init_waitqueue_head(&info->status_event_wait_q);
                 init_waitqueue_head(&info->event_wait_q);
                 spin_lock_init(&info->irq_spinlock);
@@ -6575,7 +6566,7 @@ static bool mgsl_get_rx_frame(struct mgsl_struct *info)
         unsigned int framesize = 0;
         bool ReturnCode = false;
         unsigned long flags;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         bool return_frame = false;
         
         /*
@@ -6773,7 +6764,7 @@ static bool mgsl_get_raw_rx_frame(struct mgsl_struct *info)
         unsigned int framesize = 0;
         bool ReturnCode = false;
         unsigned long flags;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
 
         /*
          * current_rx_buffer points to the 1st buffer of the next available
@@ -7710,7 +7701,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
         unsigned short new_crctype;
 
         /* return error if TTY interface open */
-        if (info->count)
+        if (info->port.count)
                 return -EBUSY;
 
         switch (encoding)
@@ -7806,7 +7797,7 @@ static int hdlcdev_open(struct net_device *dev)
 
         /* arbitrate between network and tty opens */
         spin_lock_irqsave(&info->netlock, flags);
-        if (info->count != 0 || info->netcount != 0) {
+        if (info->port.count != 0 || info->netcount != 0) {
                 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
                 spin_unlock_irqrestore(&info->netlock, flags);
                 return -EBUSY;
@@ -7892,7 +7883,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
 
         /* return error if TTY interface open */
-        if (info->count)
+        if (info->port.count)
                 return -EBUSY;
 
         if (cmd != SIOCWANDEV)
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index d88a607e34b7..2c3e43bb2cc9 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -244,11 +244,11 @@ struct _input_signal_events {
  */
 struct slgt_info {
         void *if_ptr;           /* General purpose pointer (used by SPPP) */
+        struct tty_port port;
 
         struct slgt_info *next_device;  /* device list link */
 
         int magic;
-        int flags;
 
         char device_name[25];
         struct pci_dev *pdev;
@@ -260,23 +260,15 @@ struct slgt_info {
         /* array of pointers to port contexts on this adapter */
         struct slgt_info *port_array[SLGT_MAX_PORTS];
 
-        int                     count;          /* count of opens */
         int                     line;           /* tty line instance number */
-        unsigned short          close_delay;
-        unsigned short          closing_wait;   /* time to wait before closing */
 
         struct mgsl_icount      icount;
 
-        struct tty_struct       *tty;
         int                     timeout;
         int                     x_char;         /* xon/xoff character */
-        int                     blocked_open;   /* # of blocked opens */
         unsigned int            read_status_mask;
         unsigned int            ignore_status_mask;
 
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
-
         wait_queue_head_t       status_event_wait_q;
         wait_queue_head_t       event_wait_q;
         struct timer_list       tx_timer;
@@ -641,8 +633,8 @@ static void ldisc_receive_buf(struct tty_struct *tty,
                 return;
         ld = tty_ldisc_ref(tty);
         if (ld) {
-                if (ld->receive_buf)
-                        ld->receive_buf(tty, data, flags, count);
+                if (ld->ops->receive_buf)
+                        ld->ops->receive_buf(tty, data, flags, count);
                 tty_ldisc_deref(ld);
         }
 }
@@ -672,20 +664,20 @@ static int open(struct tty_struct *tty, struct file *filp)
         }
 
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
 
-        DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->count));
+        DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
 
         /* If port is closing, signal caller to try again */
-        if (tty_hung_up_p(filp) || info->flags & ASYNC_CLOSING){
-                if (info->flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->close_wait);
-                retval = ((info->flags & ASYNC_HUP_NOTIFY) ?
+        if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
+                if (info->port.flags & ASYNC_CLOSING)
+                        interruptible_sleep_on(&info->port.close_wait);
+                retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
                         -EAGAIN : -ERESTARTSYS);
                 goto cleanup;
         }
 
-        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        info->port.tty->low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         spin_lock_irqsave(&info->netlock, flags);
         if (info->netcount) {
@@ -693,10 +685,10 @@ static int open(struct tty_struct *tty, struct file *filp)
                 spin_unlock_irqrestore(&info->netlock, flags);
                 goto cleanup;
         }
-        info->count++;
+        info->port.count++;
         spin_unlock_irqrestore(&info->netlock, flags);
 
-        if (info->count == 1) {
+        if (info->port.count == 1) {
                 /* 1st open on this device, init hardware */
                 retval = startup(info);
                 if (retval < 0)
@@ -714,9 +706,9 @@ static int open(struct tty_struct *tty, struct file *filp)
 cleanup:
         if (retval) {
                 if (tty->count == 1)
-                        info->tty = NULL; /* tty layer will release tty struct */
-                if(info->count)
-                        info->count--;
+                        info->port.tty = NULL; /* tty layer will release tty struct */
+                if(info->port.count)
+                        info->port.count--;
         }
 
         DBGINFO(("%s open rc=%d\n", info->device_name, retval));
@@ -729,32 +721,32 @@ static void close(struct tty_struct *tty, struct file *filp)
 
         if (sanity_check(info, tty->name, "close"))
                 return;
-        DBGINFO(("%s close entry, count=%d\n", info->device_name, info->count));
+        DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
 
-        if (!info->count)
+        if (!info->port.count)
                 return;
 
         if (tty_hung_up_p(filp))
                 goto cleanup;
 
-        if ((tty->count == 1) && (info->count != 1)) {
+        if ((tty->count == 1) && (info->port.count != 1)) {
                 /*
                  * tty->count is 1 and the tty structure will be freed.
-                 * info->count should be one in this case.
+                 * info->port.count should be one in this case.
                  * if it's not, correct it so that the port is shutdown.
                  */
                 DBGERR(("%s close: bad refcount; tty->count=1, "
-                       "info->count=%d\n", info->device_name, info->count));
-                info->count = 1;
+                       "info->port.count=%d\n", info->device_name, info->port.count));
+                info->port.count = 1;
         }
 
-        info->count--;
+        info->port.count--;
 
         /* if at least one open remaining, leave hardware active */
-        if (info->count)
+        if (info->port.count)
                 goto cleanup;
 
-        info->flags |= ASYNC_CLOSING;
+        info->port.flags |= ASYNC_CLOSING;
 
         /* set tty->closing to notify line discipline to
          * only process XON/XOFF characters. Only the N_TTY
@@ -764,12 +756,12 @@ static void close(struct tty_struct *tty, struct file *filp)
 
         /* wait for transmit data to clear all layers */
 
-        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE) {
+        if (info->port.closing_wait != ASYNC_CLOSING_WAIT_NONE) {
                 DBGINFO(("%s call tty_wait_until_sent\n", info->device_name));
-                tty_wait_until_sent(tty, info->closing_wait);
+                tty_wait_until_sent(tty, info->port.closing_wait);
         }
 
-        if (info->flags & ASYNC_INITIALIZED)
+        if (info->port.flags & ASYNC_INITIALIZED)
                 wait_until_sent(tty, info->timeout);
         flush_buffer(tty);
         tty_ldisc_flush(tty);
@@ -777,21 +769,21 @@ static void close(struct tty_struct *tty, struct file *filp)
         shutdown(info);
 
         tty->closing = 0;
-        info->tty = NULL;
+        info->port.tty = NULL;
 
-        if (info->blocked_open) {
-                if (info->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
+        if (info->port.blocked_open) {
+                if (info->port.close_delay) {
+                        msleep_interruptible(jiffies_to_msecs(info->port.close_delay));
                 }
-                wake_up_interruptible(&info->open_wait);
+                wake_up_interruptible(&info->port.open_wait);
         }
 
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        info->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
 
-        wake_up_interruptible(&info->close_wait);
+        wake_up_interruptible(&info->port.close_wait);
 
 cleanup:
-        DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->count));
+        DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
 }
 
 static void hangup(struct tty_struct *tty)
@@ -805,11 +797,11 @@ static void hangup(struct tty_struct *tty)
         flush_buffer(tty);
         shutdown(info);
 
-        info->count = 0;
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = NULL;
+        info->port.count = 0;
+        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->port.tty = NULL;
 
-        wake_up_interruptible(&info->open_wait);
+        wake_up_interruptible(&info->port.open_wait);
 }
 
 static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
@@ -959,7 +951,7 @@ static void wait_until_sent(struct tty_struct *tty, int timeout)
         if (sanity_check(info, tty->name, "wait_until_sent"))
                 return;
         DBGINFO(("%s wait_until_sent entry\n", info->device_name));
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 goto exit;
 
         orig_jiffies = jiffies;
@@ -1500,7 +1492,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
         unsigned short new_crctype;
 
         /* return error if TTY interface open */
-        if (info->count)
+        if (info->port.count)
                 return -EBUSY;
 
         DBGINFO(("%s hdlcdev_attach\n", info->device_name));
@@ -1599,7 +1591,7 @@ static int hdlcdev_open(struct net_device *dev)
 
         /* arbitrate between network and tty opens */
         spin_lock_irqsave(&info->netlock, flags);
-        if (info->count != 0 || info->netcount != 0) {
+        if (info->port.count != 0 || info->netcount != 0) {
                 DBGINFO(("%s hdlc_open busy\n", dev->name));
                 spin_unlock_irqrestore(&info->netlock, flags);
                 return -EBUSY;
@@ -1684,7 +1676,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
 
         /* return error if TTY interface open */
-        if (info->count)
+        if (info->port.count)
                 return -EBUSY;
 
         if (cmd != SIOCWANDEV)
@@ -1903,7 +1895,7 @@ static void hdlcdev_exit(struct slgt_info *info)
  */
 static void rx_async(struct slgt_info *info)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         struct mgsl_icount *icount = &info->icount;
         unsigned int start, end;
         unsigned char *p;
@@ -2054,7 +2046,7 @@ static void bh_handler(struct work_struct *work)
 
 static void bh_transmit(struct slgt_info *info)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
 
         DBGBH(("%s bh_transmit\n", info->device_name));
         if (tty)
@@ -2100,17 +2092,17 @@ static void cts_change(struct slgt_info *info, unsigned short status)
         wake_up_interruptible(&info->event_wait_q);
         info->pending_bh |= BH_STATUS;
 
-        if (info->flags & ASYNC_CTS_FLOW) {
-                if (info->tty) {
-                        if (info->tty->hw_stopped) {
+        if (info->port.flags & ASYNC_CTS_FLOW) {
+                if (info->port.tty) {
+                        if (info->port.tty->hw_stopped) {
                                 if (info->signals & SerialSignal_CTS) {
-                                        info->tty->hw_stopped = 0;
+                                        info->port.tty->hw_stopped = 0;
                                         info->pending_bh |= BH_TRANSMIT;
                                         return;
                                 }
                         } else {
                                 if (!(info->signals & SerialSignal_CTS))
-                                        info->tty->hw_stopped = 1;
+                                        info->port.tty->hw_stopped = 1;
                         }
                 }
         }
@@ -2143,12 +2135,12 @@ static void dcd_change(struct slgt_info *info, unsigned short status)
         wake_up_interruptible(&info->event_wait_q);
         info->pending_bh |= BH_STATUS;
 
-        if (info->flags & ASYNC_CHECK_CD) {
+        if (info->port.flags & ASYNC_CHECK_CD) {
                 if (info->signals & SerialSignal_DCD)
-                        wake_up_interruptible(&info->open_wait);
+                        wake_up_interruptible(&info->port.open_wait);
                 else {
-                        if (info->tty)
-                                tty_hangup(info->tty);
+                        if (info->port.tty)
+                                tty_hangup(info->port.tty);
                 }
         }
 }
@@ -2191,12 +2183,12 @@ static void isr_serial(struct slgt_info *info)
                 if ((status & IRQ_RXBREAK) && (status & RXBREAK)) {
                         info->icount.brk++;
                         /* process break detection if tty control allows */
-                        if (info->tty) {
+                        if (info->port.tty) {
                                 if (!(status & info->ignore_status_mask)) {
                                         if (info->read_status_mask & MASK_BREAK) {
-                                                tty_insert_flip_char(info->tty, 0, TTY_BREAK);
-                                                if (info->flags & ASYNC_SAK)
-                                                        do_SAK(info->tty);
+                                                tty_insert_flip_char(info->port.tty, 0, TTY_BREAK);
+                                                if (info->port.flags & ASYNC_SAK)
+                                                        do_SAK(info->port.tty);
                                         }
                                 }
                         }
@@ -2316,7 +2308,7 @@ static void isr_txeom(struct slgt_info *info, unsigned short status)
                 else
 #endif
                 {
-                        if (info->tty && (info->tty->stopped || info->tty->hw_stopped)) {
+                        if (info->port.tty && (info->port.tty->stopped || info->port.tty->hw_stopped)) {
                                 tx_stop(info);
                                 return;
                         }
@@ -2392,7 +2384,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
         for(i=0; i < info->port_count ; i++) {
                 struct slgt_info *port = info->port_array[i];
 
-                if (port && (port->count || port->netcount) &&
+                if (port && (port->port.count || port->netcount) &&
                     port->pending_bh && !port->bh_running &&
                     !port->bh_requested) {
                         DBGISR(("%s bh queued\n", port->device_name));
@@ -2411,7 +2403,7 @@ static int startup(struct slgt_info *info)
 {
         DBGINFO(("%s startup\n", info->device_name));
 
-        if (info->flags & ASYNC_INITIALIZED)
+        if (info->port.flags & ASYNC_INITIALIZED)
                 return 0;
 
         if (!info->tx_buf) {
@@ -2429,10 +2421,10 @@ static int startup(struct slgt_info *info)
         /* program hardware for current parameters */
         change_params(info);
 
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-        info->flags |= ASYNC_INITIALIZED;
+        info->port.flags |= ASYNC_INITIALIZED;
 
         return 0;
 }
@@ -2444,7 +2436,7 @@ static void shutdown(struct slgt_info *info)
 {
         unsigned long flags;
 
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 return;
 
         DBGINFO(("%s shutdown\n", info->device_name));
@@ -2467,7 +2459,7 @@ static void shutdown(struct slgt_info *info)
 
         slgt_irq_off(info, IRQ_ALL | IRQ_MASTER);
 
-        if (!info->tty || info->tty->termios->c_cflag & HUPCL) {
+        if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) {
                 info->signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
                 set_signals(info);
         }
@@ -2476,10 +2468,10 @@ static void shutdown(struct slgt_info *info)
 
         spin_unlock_irqrestore(&info->lock,flags);
 
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-        info->flags &= ~ASYNC_INITIALIZED;
+        info->port.flags &= ~ASYNC_INITIALIZED;
 }
 
 static void program_hw(struct slgt_info *info)
@@ -2508,7 +2500,7 @@ static void program_hw(struct slgt_info *info)
         get_signals(info);
 
         if (info->netcount ||
-            (info->tty && info->tty->termios->c_cflag & CREAD))
+            (info->port.tty && info->port.tty->termios->c_cflag & CREAD))
                 rx_start(info);
 
         spin_unlock_irqrestore(&info->lock,flags);
@@ -2522,11 +2514,11 @@ static void change_params(struct slgt_info *info)
         unsigned cflag;
         int bits_per_char;
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
         DBGINFO(("%s change_params\n", info->device_name));
 
-        cflag = info->tty->termios->c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
 
         /* if B0 rate (hangup) specified then negate DTR and RTS */
         /* otherwise assert DTR and RTS */
@@ -2558,7 +2550,7 @@ static void change_params(struct slgt_info *info)
         bits_per_char = info->params.data_bits +
                         info->params.stop_bits + 1;
 
-        info->params.data_rate = tty_get_baud_rate(info->tty);
+        info->params.data_rate = tty_get_baud_rate(info->port.tty);
 
         if (info->params.data_rate) {
                 info->timeout = (32*HZ*bits_per_char) /
@@ -2567,30 +2559,30 @@ static void change_params(struct slgt_info *info)
         info->timeout += HZ/50;         /* Add .02 seconds of slop */
 
         if (cflag & CRTSCTS)
-                info->flags |= ASYNC_CTS_FLOW;
+                info->port.flags |= ASYNC_CTS_FLOW;
         else
-                info->flags &= ~ASYNC_CTS_FLOW;
+                info->port.flags &= ~ASYNC_CTS_FLOW;
 
         if (cflag & CLOCAL)
-                info->flags &= ~ASYNC_CHECK_CD;
+                info->port.flags &= ~ASYNC_CHECK_CD;
         else
-                info->flags |= ASYNC_CHECK_CD;
+                info->port.flags |= ASYNC_CHECK_CD;
 
         /* process tty input control flags */
 
         info->read_status_mask = IRQ_RXOVER;
-        if (I_INPCK(info->tty))
+        if (I_INPCK(info->port.tty))
                 info->read_status_mask |= MASK_PARITY | MASK_FRAMING;
-        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
+        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
                 info->read_status_mask |= MASK_BREAK;
-        if (I_IGNPAR(info->tty))
+        if (I_IGNPAR(info->port.tty))
                 info->ignore_status_mask |= MASK_PARITY | MASK_FRAMING;
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(info->port.tty)) {
                 info->ignore_status_mask |= MASK_BREAK;
                 /* If ignoring parity and break indicators, ignore
                  * overruns too.  (For real raw support).
                  */
-                if (I_IGNPAR(info->tty))
+                if (I_IGNPAR(info->port.tty))
                         info->ignore_status_mask |= MASK_OVERRUN;
         }
 
@@ -3141,7 +3133,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
         if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
                 /* nonblock mode is set or port is not enabled */
-                info->flags |= ASYNC_NORMAL_ACTIVE;
+                info->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
 
@@ -3150,21 +3142,21 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
         /* Wait for carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
-         * this loop, info->count is dropped by one, so that
+         * this loop, info->port.count is dropped by one, so that
          * close() knows when to free things.  We restore it upon
          * exit, either normal or abnormal.
          */
 
         retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
+        add_wait_queue(&info->port.open_wait, &wait);
 
         spin_lock_irqsave(&info->lock, flags);
         if (!tty_hung_up_p(filp)) {
                 extra_count = true;
-                info->count--;
+                info->port.count--;
         }
         spin_unlock_irqrestore(&info->lock, flags);
-        info->blocked_open++;
+        info->port.blocked_open++;
 
         while (1) {
                 if ((tty->termios->c_cflag & CBAUD)) {
@@ -3176,8 +3168,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
                 set_current_state(TASK_INTERRUPTIBLE);
 
-                if (tty_hung_up_p(filp) || !(info->flags & ASYNC_INITIALIZED)){
-                        retval = (info->flags & ASYNC_HUP_NOTIFY) ?
+                if (tty_hung_up_p(filp) || !(info->port.flags & ASYNC_INITIALIZED)){
+                        retval = (info->port.flags & ASYNC_HUP_NOTIFY) ?
                                         -EAGAIN : -ERESTARTSYS;
                         break;
                 }
@@ -3186,7 +3178,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 get_signals(info);
                 spin_unlock_irqrestore(&info->lock,flags);
 
-                if (!(info->flags & ASYNC_CLOSING) &&
+                if (!(info->port.flags & ASYNC_CLOSING) &&
                     (do_clocal || (info->signals & SerialSignal_DCD)) ) {
                         break;
                 }
@@ -3201,14 +3193,14 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         }
 
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
+        remove_wait_queue(&info->port.open_wait, &wait);
 
         if (extra_count)
-                info->count++;
-        info->blocked_open--;
+                info->port.count++;
+        info->port.blocked_open--;
 
         if (!retval)
-                info->flags |= ASYNC_NORMAL_ACTIVE;
+                info->port.flags |= ASYNC_NORMAL_ACTIVE;
 
         DBGINFO(("%s block_til_ready ready, rc=%d\n", tty->driver->name, retval));
         return retval;
@@ -3451,14 +3443,13 @@ static struct slgt_info *alloc_dev(int adapter_num, int port_num, struct pci_dev
                 DBGERR(("%s device alloc failed adapter=%d port=%d\n",
                         driver_name, adapter_num, port_num));
         } else {
+                tty_port_init(&info->port);
                 info->magic = MGSL_MAGIC;
                 INIT_WORK(&info->task, bh_handler);
                 info->max_frame_size = 4096;
                 info->raw_rx_size = DMABUFSIZE;
-                info->close_delay = 5*HZ/10;
-                info->closing_wait = 30*HZ;
-                init_waitqueue_head(&info->open_wait);
-                init_waitqueue_head(&info->close_wait);
+                info->port.close_delay = 5*HZ/10;
+                info->port.closing_wait = 30*HZ;
                 init_waitqueue_head(&info->status_event_wait_q);
                 init_waitqueue_head(&info->event_wait_q);
                 spin_lock_init(&info->netlock);
@@ -4502,7 +4493,7 @@ static bool rx_get_frame(struct slgt_info *info)
         unsigned short status;
         unsigned int framesize = 0;
         unsigned long flags;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         unsigned char addr_field = 0xff;
         unsigned int crc_size = 0;
 
@@ -4652,7 +4643,7 @@ static bool rx_get_buf(struct slgt_info *info)
         DBGDATA(info, info->rbufs[i].buf, count, "rx");
         DBGINFO(("rx_get_buf size=%d\n", count));
         if (count)
-                ldisc_receive_buf(info->tty, info->rbufs[i].buf,
+                ldisc_receive_buf(info->port.tty, info->rbufs[i].buf,
                                   info->flag_buf, count);
         free_rbufs(info, i, i);
         return true;
@@ -4761,11 +4752,11 @@ static int irq_test(struct slgt_info *info)
 {
         unsigned long timeout;
         unsigned long flags;
-        struct tty_struct *oldtty = info->tty;
+        struct tty_struct *oldtty = info->port.tty;
         u32 speed = info->params.data_rate;
 
         info->params.data_rate = 921600;
-        info->tty = NULL;
+        info->port.tty = NULL;
 
         spin_lock_irqsave(&info->lock, flags);
         async_mode(info);
@@ -4793,7 +4784,7 @@ static int irq_test(struct slgt_info *info)
         spin_unlock_irqrestore(&info->lock,flags);
 
         info->params.data_rate = speed;
-        info->tty = oldtty;
+        info->port.tty = oldtty;
 
         info->init_error = info->irq_occurred ? 0 : DiagStatus_IrqFailure;
         return info->irq_occurred ? 0 : -ENODEV;
@@ -4833,7 +4824,7 @@ static int loopback_test(struct slgt_info *info)
         int rc = -ENODEV;
         unsigned long flags;
 
-        struct tty_struct *oldtty = info->tty;
+        struct tty_struct *oldtty = info->port.tty;
         MGSL_PARAMS params;
 
         memcpy(&params, &info->params, sizeof(params));
@@ -4841,7 +4832,7 @@ static int loopback_test(struct slgt_info *info)
         info->params.mode = MGSL_MODE_ASYNC;
         info->params.data_rate = 921600;
         info->params.loopback = 1;
-        info->tty = NULL;
+        info->port.tty = NULL;
 
         /* build and send transmit frame */
         for (count = 0; count < TESTFRAMESIZE; ++count)
@@ -4879,7 +4870,7 @@ static int loopback_test(struct slgt_info *info)
         spin_unlock_irqrestore(&info->lock,flags);
 
         memcpy(&info->params, &params, sizeof(info->params));
-        info->tty = oldtty;
+        info->port.tty = oldtty;
 
         info->init_error = rc ? DiagStatus_DmaFailure : 0;
         return rc;
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 10241ed86100..5768c4136342 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -151,18 +151,15 @@ struct	_input_signal_events {
 typedef struct _synclinkmp_info {
         void *if_ptr;                           /* General purpose pointer (used by SPPP) */
         int                     magic;
-        int                     flags;
-        int                     count;          /* count of opens */
+        struct tty_port         port;
         int                     line;
         unsigned short          close_delay;
         unsigned short          closing_wait;   /* time to wait before closing */
 
         struct mgsl_icount      icount;
 
-        struct tty_struct       *tty;
         int                     timeout;
         int                     x_char;         /* xon/xoff character */
-        int                     blocked_open;   /* # of blocked opens */
         u16                     read_status_mask1;  /* break detection (SR1 indications) */
         u16                     read_status_mask2;  /* parity/framing/overun (SR2 indications) */
         unsigned char           ignore_status_mask1;  /* break detection (SR1 indications) */
@@ -172,9 +169,6 @@ typedef struct _synclinkmp_info {
         int                     tx_get;
         int                     tx_count;
 
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
-
         wait_queue_head_t       status_event_wait_q;
         wait_queue_head_t       event_wait_q;
         struct timer_list       tx_timer;       /* HDLC transmit timeout timer */
@@ -462,13 +456,13 @@ static int synclinkmp_device_count = 0;
  * .text section address and breakpoint on module load.
  * This is useful for use with gdb and add-symbol-file command.
  */
-static int break_on_load=0;
+static int break_on_load = 0;
 
 /*
  * Driver major number, defaults to zero to get auto
  * assigned major number. May be forced as module parameter.
  */
-static int ttymajor=0;
+static int ttymajor = 0;
 
 /*
  * Array of user specified options for ISA adapters.
@@ -712,8 +706,8 @@ static void ldisc_receive_buf(struct tty_struct *tty,
                 return;
         ld = tty_ldisc_ref(tty);
         if (ld) {
-                if (ld->receive_buf)
-                        ld->receive_buf(tty, data, flags, count);
+                if (ld->ops->receive_buf)
+                        ld->ops->receive_buf(tty, data, flags, count);
                 tty_ldisc_deref(ld);
         }
 }
@@ -747,22 +741,22 @@ static int open(struct tty_struct *tty, struct file *filp)
         }
 
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):%s open(), old ref count = %d\n",
-                         __FILE__,__LINE__,tty->driver->name, info->count);
+                         __FILE__,__LINE__,tty->driver->name, info->port.count);
 
         /* If port is closing, signal caller to try again */
-        if (tty_hung_up_p(filp) || info->flags & ASYNC_CLOSING){
-                if (info->flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->close_wait);
-                retval = ((info->flags & ASYNC_HUP_NOTIFY) ?
+        if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
+                if (info->port.flags & ASYNC_CLOSING)
+                        interruptible_sleep_on(&info->port.close_wait);
+                retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
                         -EAGAIN : -ERESTARTSYS);
                 goto cleanup;
         }
 
-        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        info->port.tty->low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         spin_lock_irqsave(&info->netlock, flags);
         if (info->netcount) {
@@ -770,10 +764,10 @@ static int open(struct tty_struct *tty, struct file *filp)
                 spin_unlock_irqrestore(&info->netlock, flags);
                 goto cleanup;
         }
-        info->count++;
+        info->port.count++;
         spin_unlock_irqrestore(&info->netlock, flags);
 
-        if (info->count == 1) {
+        if (info->port.count == 1) {
                 /* 1st open on this device, init hardware */
                 retval = startup(info);
                 if (retval < 0)
@@ -796,9 +790,9 @@ static int open(struct tty_struct *tty, struct file *filp)
 cleanup:
         if (retval) {
                 if (tty->count == 1)
-                        info->tty = NULL; /* tty layer will release tty struct */
-                if(info->count)
-                        info->count--;
+                        info->port.tty = NULL; /* tty layer will release tty struct */
+                if(info->port.count)
+                        info->port.count--;
         }
 
         return retval;
@@ -816,33 +810,33 @@ static void close(struct tty_struct *tty, struct file *filp)
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):%s close() entry, count=%d\n",
-                         __FILE__,__LINE__, info->device_name, info->count);
+                         __FILE__,__LINE__, info->device_name, info->port.count);
 
-        if (!info->count)
+        if (!info->port.count)
                 return;
 
         if (tty_hung_up_p(filp))
                 goto cleanup;
 
-        if ((tty->count == 1) && (info->count != 1)) {
+        if ((tty->count == 1) && (info->port.count != 1)) {
                 /*
                  * tty->count is 1 and the tty structure will be freed.
-                 * info->count should be one in this case.
+                 * info->port.count should be one in this case.
                  * if it's not, correct it so that the port is shutdown.
                  */
                 printk("%s(%d):%s close: bad refcount; tty->count is 1, "
-                       "info->count is %d\n",
-                         __FILE__,__LINE__, info->device_name, info->count);
-                info->count = 1;
+                       "info->port.count is %d\n",
+                         __FILE__,__LINE__, info->device_name, info->port.count);
+                info->port.count = 1;
         }
 
-        info->count--;
+        info->port.count--;
 
         /* if at least one open remaining, leave hardware active */
-        if (info->count)
+        if (info->port.count)
                 goto cleanup;
 
-        info->flags |= ASYNC_CLOSING;
+        info->port.flags |= ASYNC_CLOSING;
 
         /* set tty->closing to notify line discipline to
          * only process XON/XOFF characters. Only the N_TTY
@@ -852,14 +846,14 @@ static void close(struct tty_struct *tty, struct file *filp)
 
         /* wait for transmit data to clear all layers */
 
-        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE) {
+        if (info->port.closing_wait != ASYNC_CLOSING_WAIT_NONE) {
                 if (debug_level >= DEBUG_LEVEL_INFO)
                         printk("%s(%d):%s close() calling tty_wait_until_sent\n",
                                  __FILE__,__LINE__, info->device_name );
-                tty_wait_until_sent(tty, info->closing_wait);
+                tty_wait_until_sent(tty, info->port.closing_wait);
         }
 
-        if (info->flags & ASYNC_INITIALIZED)
+        if (info->port.flags & ASYNC_INITIALIZED)
                 wait_until_sent(tty, info->timeout);
 
         flush_buffer(tty);
@@ -869,23 +863,23 @@ static void close(struct tty_struct *tty, struct file *filp)
         shutdown(info);
 
         tty->closing = 0;
-        info->tty = NULL;
+        info->port.tty = NULL;
 
-        if (info->blocked_open) {
-                if (info->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
+        if (info->port.blocked_open) {
+                if (info->port.close_delay) {
+                        msleep_interruptible(jiffies_to_msecs(info->port.close_delay));
                 }
-                wake_up_interruptible(&info->open_wait);
+                wake_up_interruptible(&info->port.open_wait);
         }
 
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
+        info->port.flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
 
-        wake_up_interruptible(&info->close_wait);
+        wake_up_interruptible(&info->port.close_wait);
 
 cleanup:
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
-                        tty->driver->name, info->count);
+                        tty->driver->name, info->port.count);
 }
 
 /* Called by tty_hangup() when a hangup is signaled.
@@ -905,11 +899,11 @@ static void hangup(struct tty_struct *tty)
         flush_buffer(tty);
         shutdown(info);
 
-        info->count = 0;
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = NULL;
+        info->port.count = 0;
+        info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->port.tty = NULL;
 
-        wake_up_interruptible(&info->open_wait);
+        wake_up_interruptible(&info->port.open_wait);
 }
 
 /* Set new termios settings
@@ -1123,7 +1117,7 @@ static void wait_until_sent(struct tty_struct *tty, int timeout)
 
         lock_kernel();
 
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 goto exit;
 
         orig_jiffies = jiffies;
@@ -1636,7 +1630,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
         unsigned short new_crctype;
 
         /* return error if TTY interface open */
-        if (info->count)
+        if (info->port.count)
                 return -EBUSY;
 
         switch (encoding)
@@ -1732,7 +1726,7 @@ static int hdlcdev_open(struct net_device *dev)
 
         /* arbitrate between network and tty opens */
         spin_lock_irqsave(&info->netlock, flags);
-        if (info->count != 0 || info->netcount != 0) {
+        if (info->port.count != 0 || info->netcount != 0) {
                 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
                 spin_unlock_irqrestore(&info->netlock, flags);
                 return -EBUSY;
@@ -1818,7 +1812,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
 
         /* return error if TTY interface open */
-        if (info->count)
+        if (info->port.count)
                 return -EBUSY;
 
         if (cmd != SIOCWANDEV)
@@ -2126,7 +2120,7 @@ static void bh_receive(SLMP_INFO *info)
 
 static void bh_transmit(SLMP_INFO *info)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
 
         if ( debug_level >= DEBUG_LEVEL_BH )
                 printk( "%s(%d):%s bh_transmit() entry\n",
@@ -2176,7 +2170,7 @@ static void isr_timer(SLMP_INFO * info)
 
 static void isr_rxint(SLMP_INFO * info)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         struct  mgsl_icount *icount = &info->icount;
         unsigned char status = read_reg(info, SR1) & info->ie1_value & (FLGD + IDLD + CDCD + BRKD);
         unsigned char status2 = read_reg(info, SR2) & info->ie2_value & OVRN;
@@ -2203,7 +2197,7 @@ static void isr_rxint(SLMP_INFO * info)
                                 if (!(status & info->ignore_status_mask1)) {
                                         if (info->read_status_mask1 & BRKD) {
                                                 tty_insert_flip_char(tty, 0, TTY_BREAK);
-                                                if (info->flags & ASYNC_SAK)
+                                                if (info->port.flags & ASYNC_SAK)
                                                         do_SAK(tty);
                                         }
                                 }
@@ -2237,7 +2231,7 @@ static void isr_rxrdy(SLMP_INFO * info)
 {
         u16 status;
         unsigned char DataByte;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         struct  mgsl_icount *icount = &info->icount;
 
         if ( debug_level >= DEBUG_LEVEL_ISR )
@@ -2350,7 +2344,7 @@ static void isr_txeom(SLMP_INFO * info, unsigned char status)
                 else
 #endif
                 {
-                        if (info->tty && (info->tty->stopped || info->tty->hw_stopped)) {
+                        if (info->port.tty && (info->port.tty->stopped || info->port.tty->hw_stopped)) {
                                 tx_stop(info);
                                 return;
                         }
@@ -2405,7 +2399,7 @@ static void isr_txrdy(SLMP_INFO * info)
                 return;
         }
 
-        if (info->tty && (info->tty->stopped || info->tty->hw_stopped)) {
+        if (info->port.tty && (info->port.tty->stopped || info->port.tty->hw_stopped)) {
                 tx_stop(info);
                 return;
         }
@@ -2552,29 +2546,29 @@ static void isr_io_pin( SLMP_INFO *info, u16 status )
                 wake_up_interruptible(&info->status_event_wait_q);
                 wake_up_interruptible(&info->event_wait_q);
 
-                if ( (info->flags & ASYNC_CHECK_CD) &&
+                if ( (info->port.flags & ASYNC_CHECK_CD) &&
                      (status & MISCSTATUS_DCD_LATCHED) ) {
                         if ( debug_level >= DEBUG_LEVEL_ISR )
                                 printk("%s CD now %s...", info->device_name,
                                        (status & SerialSignal_DCD) ? "on" : "off");
                         if (status & SerialSignal_DCD)
-                                wake_up_interruptible(&info->open_wait);
+                                wake_up_interruptible(&info->port.open_wait);
                         else {
                                 if ( debug_level >= DEBUG_LEVEL_ISR )
                                         printk("doing serial hangup...");
-                                if (info->tty)
-                                        tty_hangup(info->tty);
+                                if (info->port.tty)
+                                        tty_hangup(info->port.tty);
                         }
                 }
 
-                if ( (info->flags & ASYNC_CTS_FLOW) &&
+                if ( (info->port.flags & ASYNC_CTS_FLOW) &&
                      (status & MISCSTATUS_CTS_LATCHED) ) {
-                        if ( info->tty ) {
-                                if (info->tty->hw_stopped) {
+                        if ( info->port.tty ) {
+                                if (info->port.tty->hw_stopped) {
                                         if (status & SerialSignal_CTS) {
                                                 if ( debug_level >= DEBUG_LEVEL_ISR )
                                                         printk("CTS tx start...");
-                                                info->tty->hw_stopped = 0;
+                                                info->port.tty->hw_stopped = 0;
                                                 tx_start(info);
                                                 info->pending_bh |= BH_TRANSMIT;
                                                 return;
@@ -2583,7 +2577,7 @@ static void isr_io_pin( SLMP_INFO *info, u16 status )
                                         if (!(status & SerialSignal_CTS)) {
                                                 if ( debug_level >= DEBUG_LEVEL_ISR )
                                                         printk("CTS tx stop...");
-                                                info->tty->hw_stopped = 1;
+                                                info->port.tty->hw_stopped = 1;
                                                 tx_stop(info);
                                         }
                                 }
@@ -2699,7 +2693,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
                  * do not request bottom half processing if the
                  * device is not open in a normal mode.
                  */
-                if ( port && (port->count || port->netcount) &&
+                if ( port && (port->port.count || port->netcount) &&
                      port->pending_bh && !port->bh_running &&
                      !port->bh_requested ) {
                         if ( debug_level >= DEBUG_LEVEL_ISR )
@@ -2725,7 +2719,7 @@ static int startup(SLMP_INFO * info)
         if ( debug_level >= DEBUG_LEVEL_INFO )
                 printk("%s(%d):%s tx_releaseup()\n",__FILE__,__LINE__,info->device_name);
 
-        if (info->flags & ASYNC_INITIALIZED)
+        if (info->port.flags & ASYNC_INITIALIZED)
                 return 0;
 
         if (!info->tx_buf) {
@@ -2748,10 +2742,10 @@ static int startup(SLMP_INFO * info)
 
         mod_timer(&info->status_timer, jiffies + msecs_to_jiffies(10));
 
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-        info->flags |= ASYNC_INITIALIZED;
+        info->port.flags |= ASYNC_INITIALIZED;
 
         return 0;
 }
@@ -2762,7 +2756,7 @@ static void shutdown(SLMP_INFO * info)
 {
         unsigned long flags;
 
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->port.flags & ASYNC_INITIALIZED))
                 return;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -2784,17 +2778,17 @@ static void shutdown(SLMP_INFO * info)
 
         reset_port(info);
 
-        if (!info->tty || info->tty->termios->c_cflag & HUPCL) {
+        if (!info->port.tty || info->port.tty->termios->c_cflag & HUPCL) {
                 info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
                 set_signals(info);
         }
 
         spin_unlock_irqrestore(&info->lock,flags);
 
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-        info->flags &= ~ASYNC_INITIALIZED;
+        info->port.flags &= ~ASYNC_INITIALIZED;
 }
 
 static void program_hw(SLMP_INFO *info)
@@ -2825,7 +2819,7 @@ static void program_hw(SLMP_INFO *info)
 
         get_signals(info);
 
-        if (info->netcount || (info->tty && info->tty->termios->c_cflag & CREAD) )
+        if (info->netcount || (info->port.tty && info->port.tty->termios->c_cflag & CREAD) )
                 rx_start(info);
 
         spin_unlock_irqrestore(&info->lock,flags);
@@ -2838,14 +2832,14 @@ static void change_params(SLMP_INFO *info)
         unsigned cflag;
         int bits_per_char;
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):%s change_params()\n",
                          __FILE__,__LINE__, info->device_name );
 
-        cflag = info->tty->termios->c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
 
         /* if B0 rate (hangup) specified then negate DTR and RTS */
         /* otherwise assert DTR and RTS */
@@ -2893,7 +2887,7 @@ static void change_params(SLMP_INFO *info)
          * current data rate.
          */
         if (info->params.data_rate <= 460800) {
-                info->params.data_rate = tty_get_baud_rate(info->tty);
+                info->params.data_rate = tty_get_baud_rate(info->port.tty);
         }
 
         if ( info->params.data_rate ) {
@@ -2903,30 +2897,30 @@ static void change_params(SLMP_INFO *info)
         info->timeout += HZ/50;         /* Add .02 seconds of slop */
 
         if (cflag & CRTSCTS)
-                info->flags |= ASYNC_CTS_FLOW;
+                info->port.flags |= ASYNC_CTS_FLOW;
         else
-                info->flags &= ~ASYNC_CTS_FLOW;
+                info->port.flags &= ~ASYNC_CTS_FLOW;
 
         if (cflag & CLOCAL)
-                info->flags &= ~ASYNC_CHECK_CD;
+                info->port.flags &= ~ASYNC_CHECK_CD;
         else
-                info->flags |= ASYNC_CHECK_CD;
+                info->port.flags |= ASYNC_CHECK_CD;
 
         /* process tty input control flags */
 
         info->read_status_mask2 = OVRN;
-        if (I_INPCK(info->tty))
+        if (I_INPCK(info->port.tty))
                 info->read_status_mask2 |= PE | FRME;
-        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
+        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
                 info->read_status_mask1 |= BRKD;
-        if (I_IGNPAR(info->tty))
+        if (I_IGNPAR(info->port.tty))
                 info->ignore_status_mask2 |= PE | FRME;
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(info->port.tty)) {
                 info->ignore_status_mask1 |= BRKD;
                 /* If ignoring parity and break indicators, ignore
                  * overruns too.  (For real raw support).
                  */
-                if (I_IGNPAR(info->tty))
+                if (I_IGNPAR(info->port.tty))
                         info->ignore_status_mask2 |= OVRN;
         }
 
@@ -3346,7 +3340,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
         if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
                 /* nonblock mode is set or port is not enabled */
                 /* just verify that callout device is not active */
-                info->flags |= ASYNC_NORMAL_ACTIVE;
+                info->port.flags |= ASYNC_NORMAL_ACTIVE;
                 return 0;
         }
 
@@ -3355,25 +3349,25 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
         /* Wait for carrier detect and the line to become
          * free (i.e., not in use by the callout).  While we are in
-         * this loop, info->count is dropped by one, so that
+         * this loop, info->port.count is dropped by one, so that
          * close() knows when to free things.  We restore it upon
          * exit, either normal or abnormal.
          */
 
         retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
+        add_wait_queue(&info->port.open_wait, &wait);
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
-                         __FILE__,__LINE__, tty->driver->name, info->count );
+                         __FILE__,__LINE__, tty->driver->name, info->port.count );
 
         spin_lock_irqsave(&info->lock, flags);
         if (!tty_hung_up_p(filp)) {
                 extra_count = true;
-                info->count--;
+                info->port.count--;
         }
         spin_unlock_irqrestore(&info->lock, flags);
-        info->blocked_open++;
+        info->port.blocked_open++;
 
         while (1) {
                 if ((tty->termios->c_cflag & CBAUD)) {
@@ -3385,8 +3379,8 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
                 set_current_state(TASK_INTERRUPTIBLE);
 
-                if (tty_hung_up_p(filp) || !(info->flags & ASYNC_INITIALIZED)){
-                        retval = (info->flags & ASYNC_HUP_NOTIFY) ?
+                if (tty_hung_up_p(filp) || !(info->port.flags & ASYNC_INITIALIZED)){
+                        retval = (info->port.flags & ASYNC_HUP_NOTIFY) ?
                                         -EAGAIN : -ERESTARTSYS;
                         break;
                 }
@@ -3395,7 +3389,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                 get_signals(info);
                 spin_unlock_irqrestore(&info->lock,flags);
 
-                if (!(info->flags & ASYNC_CLOSING) &&
+                if (!(info->port.flags & ASYNC_CLOSING) &&
                     (do_clocal || (info->serial_signals & SerialSignal_DCD)) ) {
                         break;
                 }
@@ -3407,24 +3401,24 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
                 if (debug_level >= DEBUG_LEVEL_INFO)
                         printk("%s(%d):%s block_til_ready() count=%d\n",
-                                 __FILE__,__LINE__, tty->driver->name, info->count );
+                                 __FILE__,__LINE__, tty->driver->name, info->port.count );
 
                 schedule();
         }
 
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
+        remove_wait_queue(&info->port.open_wait, &wait);
 
         if (extra_count)
-                info->count++;
-        info->blocked_open--;
+                info->port.count++;
+        info->port.blocked_open--;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):%s block_til_ready() after, count=%d\n",
-                         __FILE__,__LINE__, tty->driver->name, info->count );
+                         __FILE__,__LINE__, tty->driver->name, info->port.count );
 
         if (!retval)
-                info->flags |= ASYNC_NORMAL_ACTIVE;
+                info->port.flags |= ASYNC_NORMAL_ACTIVE;
 
         return retval;
 }
@@ -3806,13 +3800,12 @@ static SLMP_INFO *alloc_dev(int adapter_num, int port_num, struct pci_dev *pdev)
                 printk("%s(%d) Error can't allocate device instance data for adapter %d, port %d\n",
                         __FILE__,__LINE__, adapter_num, port_num);
         } else {
+                tty_port_init(&info->port);
                 info->magic = MGSL_MAGIC;
                 INIT_WORK(&info->task, bh_handler);
                 info->max_frame_size = 4096;
-                info->close_delay = 5*HZ/10;
-                info->closing_wait = 30*HZ;
-                init_waitqueue_head(&info->open_wait);
-                init_waitqueue_head(&info->close_wait);
+                info->port.close_delay = 5*HZ/10;
+                info->port.closing_wait = 30*HZ;
                 init_waitqueue_head(&info->status_event_wait_q);
                 init_waitqueue_head(&info->event_wait_q);
                 spin_lock_init(&info->netlock);
@@ -4883,7 +4876,7 @@ static bool rx_get_frame(SLMP_INFO *info)
         unsigned int framesize = 0;
         bool ReturnCode = false;
         unsigned long flags;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         unsigned char addr_field = 0xff;
         SCADESC *desc;
         SCADESC_EX *desc_ex;
@@ -5290,11 +5283,11 @@ static bool loopback_test(SLMP_INFO *info)
         bool rc = false;
         unsigned long flags;
 
-        struct tty_struct *oldtty = info->tty;
+        struct tty_struct *oldtty = info->port.tty;
         u32 speed = info->params.clock_speed;
 
         info->params.clock_speed = 3686400;
-        info->tty = NULL;
+        info->port.tty = NULL;
 
         /* assume failure */
         info->init_error = DiagStatus_DmaFailure;
@@ -5338,7 +5331,7 @@ static bool loopback_test(SLMP_INFO *info)
         spin_unlock_irqrestore(&info->lock,flags);
 
         info->params.clock_speed = speed;
-        info->tty = oldtty;
+        info->port.tty = oldtty;
 
         return rc;
 }
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 047a17339f83..82f6a8c86332 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -95,8 +95,9 @@
 #include <linux/wait.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/seq_file.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/system.h>
 
 #include <linux/kbd_kern.h>
@@ -682,7 +683,7 @@ static void tty_set_termios_ldisc(struct tty_struct *tty, int num)
 static DEFINE_SPINLOCK(tty_ldisc_lock);
 static DECLARE_WAIT_QUEUE_HEAD(tty_ldisc_wait);
 /* Line disc dispatch table */
-static struct tty_ldisc tty_ldiscs[NR_LDISCS];
+static struct tty_ldisc_ops *tty_ldiscs[NR_LDISCS];
 
 /**
  *      tty_register_ldisc      -       install a line discipline
@@ -697,7 +698,7 @@ static struct tty_ldisc tty_ldiscs[NR_LDISCS];
  *              takes tty_ldisc_lock to guard against ldisc races
  */
 
-int tty_register_ldisc(int disc, struct tty_ldisc *new_ldisc)
+int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
 {
         unsigned long flags;
         int ret = 0;
@@ -706,10 +707,9 @@ int tty_register_ldisc(int disc, struct tty_ldisc *new_ldisc)
                 return -EINVAL;
 
         spin_lock_irqsave(&tty_ldisc_lock, flags);
-        tty_ldiscs[disc] = *new_ldisc;
-        tty_ldiscs[disc].num = disc;
-        tty_ldiscs[disc].flags |= LDISC_FLAG_DEFINED;
-        tty_ldiscs[disc].refcount = 0;
+        tty_ldiscs[disc] = new_ldisc;
+        new_ldisc->num = disc;
+        new_ldisc->refcount = 0;
         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 
         return ret;
@@ -737,19 +737,56 @@ int tty_unregister_ldisc(int disc)
                 return -EINVAL;
 
         spin_lock_irqsave(&tty_ldisc_lock, flags);
-        if (tty_ldiscs[disc].refcount)
+        if (tty_ldiscs[disc]->refcount)
                 ret = -EBUSY;
         else
-                tty_ldiscs[disc].flags &= ~LDISC_FLAG_DEFINED;
+                tty_ldiscs[disc] = NULL;
         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 
         return ret;
 }
 EXPORT_SYMBOL(tty_unregister_ldisc);
 
+
+/**
+ *      tty_ldisc_try_get       -       try and reference an ldisc
+ *      @disc: ldisc number
+ *      @ld: tty ldisc structure to complete
+ *
+ *      Attempt to open and lock a line discipline into place. Return
+ *      the line discipline refcounted and assigned in ld. On an error
+ *      report the error code back
+ */
+
+static int tty_ldisc_try_get(int disc, struct tty_ldisc *ld)
+{
+        unsigned long flags;
+        struct tty_ldisc_ops *ldops;
+        int err = -EINVAL;
+        
+        spin_lock_irqsave(&tty_ldisc_lock, flags);
+        ld->ops = NULL;
+        ldops = tty_ldiscs[disc];
+        /* Check the entry is defined */
+        if (ldops) {
+                /* If the module is being unloaded we can't use it */
+                if (!try_module_get(ldops->owner))
+                        err = -EAGAIN;
+                else {
+                        /* lock it */
+                        ldops->refcount++;
+                        ld->ops = ldops;
+                        err = 0;
+                }
+        }
+        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+        return err;
+}
+
 /**
  *      tty_ldisc_get           -       take a reference to an ldisc
  *      @disc: ldisc number
+ *      @ld: tty line discipline structure to use
  *
  *      Takes a reference to a line discipline. Deals with refcounts and
  *      module locking counts. Returns NULL if the discipline is not available.
@@ -760,32 +797,20 @@ EXPORT_SYMBOL(tty_unregister_ldisc);
  *              takes tty_ldisc_lock to guard against ldisc races
  */
 
-struct tty_ldisc *tty_ldisc_get(int disc)
+static int tty_ldisc_get(int disc, struct tty_ldisc *ld)
 {
-        unsigned long flags;
-        struct tty_ldisc *ld;
+        int err;
 
         if (disc < N_TTY || disc >= NR_LDISCS)
-                return NULL;
-
-        spin_lock_irqsave(&tty_ldisc_lock, flags);
-
-        ld = &tty_ldiscs[disc];
-        /* Check the entry is defined */
-        if (ld->flags & LDISC_FLAG_DEFINED) {
-                /* If the module is being unloaded we can't use it */
-                if (!try_module_get(ld->owner))
-                        ld = NULL;
-                else /* lock it */
-                        ld->refcount++;
-        } else
-                ld = NULL;
-        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-        return ld;
+                return -EINVAL;
+        err = tty_ldisc_try_get(disc, ld);
+        if (err == -EAGAIN) {
+                request_module("tty-ldisc-%d", disc);
+                err = tty_ldisc_try_get(disc, ld);
+        }
+        return err;
 }
 
-EXPORT_SYMBOL_GPL(tty_ldisc_get);
-
 /**
  *      tty_ldisc_put           -       drop ldisc reference
  *      @disc: ldisc number
@@ -797,22 +822,67 @@ EXPORT_SYMBOL_GPL(tty_ldisc_get);
  *              takes tty_ldisc_lock to guard against ldisc races
  */
 
-void tty_ldisc_put(int disc)
+static void tty_ldisc_put(struct tty_ldisc_ops *ld)
 {
-        struct tty_ldisc *ld;
         unsigned long flags;
+        int disc = ld->num;
 
         BUG_ON(disc < N_TTY || disc >= NR_LDISCS);
 
         spin_lock_irqsave(&tty_ldisc_lock, flags);
-        ld = &tty_ldiscs[disc];
+        ld = tty_ldiscs[disc];
         BUG_ON(ld->refcount == 0);
         ld->refcount--;
         module_put(ld->owner);
         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 }
 
-EXPORT_SYMBOL_GPL(tty_ldisc_put);
+static void * tty_ldiscs_seq_start(struct seq_file *m, loff_t *pos)
+{
+        return (*pos < NR_LDISCS) ? pos : NULL;
+}
+
+static void * tty_ldiscs_seq_next(struct seq_file *m, void *v, loff_t *pos)
+{
+        (*pos)++;
+        return (*pos < NR_LDISCS) ? pos : NULL;
+}
+
+static void tty_ldiscs_seq_stop(struct seq_file *m, void *v)
+{
+}
+
+static int tty_ldiscs_seq_show(struct seq_file *m, void *v)
+{
+        int i = *(loff_t *)v;
+        struct tty_ldisc ld;
+        
+        if (tty_ldisc_get(i, &ld) < 0)
+                return 0;
+        seq_printf(m, "%-10s %2d\n", ld.ops->name ? ld.ops->name : "???", i);
+        tty_ldisc_put(ld.ops);
+        return 0;
+}
+
+static const struct seq_operations tty_ldiscs_seq_ops = {
+        .start  = tty_ldiscs_seq_start,
+        .next   = tty_ldiscs_seq_next,
+        .stop   = tty_ldiscs_seq_stop,
+        .show   = tty_ldiscs_seq_show,
+};
+
+static int proc_tty_ldiscs_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &tty_ldiscs_seq_ops);
+}
+
+const struct file_operations tty_ldiscs_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = proc_tty_ldiscs_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
 
 /**
  *      tty_ldisc_assign        -       set ldisc on a tty
@@ -829,8 +899,8 @@ EXPORT_SYMBOL_GPL(tty_ldisc_put);
 
 static void tty_ldisc_assign(struct tty_struct *tty, struct tty_ldisc *ld)
 {
+        ld->refcount = 0;
         tty->ldisc = *ld;
-        tty->ldisc.refcount = 0;
 }
 
 /**
@@ -954,6 +1024,41 @@ static void tty_ldisc_enable(struct tty_struct *tty)
 }
 
 /**
+ *      tty_ldisc_restore       -       helper for tty ldisc change
+ *      @tty: tty to recover
+ *      @old: previous ldisc
+ *
+ *      Restore the previous line discipline or N_TTY when a line discipline
+ *      change fails due to an open error
+ */
+
+static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
+{
+        char buf[64];
+        struct tty_ldisc new_ldisc;
+
+        /* There is an outstanding reference here so this is safe */
+        tty_ldisc_get(old->ops->num, old);
+        tty_ldisc_assign(tty, old);
+        tty_set_termios_ldisc(tty, old->ops->num);
+        if (old->ops->open && (old->ops->open(tty) < 0)) {
+                tty_ldisc_put(old->ops);
+                /* This driver is always present */
+                if (tty_ldisc_get(N_TTY, &new_ldisc) < 0)
+                        panic("n_tty: get");
+                tty_ldisc_assign(tty, &new_ldisc);
+                tty_set_termios_ldisc(tty, N_TTY);
+                if (new_ldisc.ops->open) {
+                        int r = new_ldisc.ops->open(tty);
+                                if (r < 0)
+                                panic("Couldn't open N_TTY ldisc for "
+                                      "%s --- error %d.",
+                                      tty_name(tty, buf), r);
+                }
+        }
+}
+
+/**
  *      tty_set_ldisc           -       set line discipline
  *      @tty: the terminal to set
  *      @ldisc: the line discipline
@@ -967,28 +1072,18 @@ static void tty_ldisc_enable(struct tty_struct *tty)
 
 static int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 {
-        int retval = 0;
-        struct tty_ldisc o_ldisc;
-        char buf[64];
+        int retval;
+        struct tty_ldisc o_ldisc, new_ldisc;
         int work;
         unsigned long flags;
-        struct tty_ldisc *ld;
         struct tty_struct *o_tty;
 
-        if ((ldisc < N_TTY) || (ldisc >= NR_LDISCS))
-                return -EINVAL;
-
 restart:
-
-        ld = tty_ldisc_get(ldisc);
-        /* Eduardo Blanco <ejbs@cs.cs.com.uy> */
-        /* Cyrus Durgin <cider@speakeasy.org> */
-        if (ld == NULL) {
-                request_module("tty-ldisc-%d", ldisc);
-                ld = tty_ldisc_get(ldisc);
-        }
-        if (ld == NULL)
-                return -EINVAL;
+        /* This is a bit ugly for now but means we can break the 'ldisc
+           is part of the tty struct' assumption later */
+        retval = tty_ldisc_get(ldisc, &new_ldisc);
+        if (retval)
+                return retval;
 
         /*
          *      Problem: What do we do if this blocks ?
@@ -996,8 +1091,8 @@ restart:
 
         tty_wait_until_sent(tty, 0);
 
-        if (tty->ldisc.num == ldisc) {
-                tty_ldisc_put(ldisc);
+        if (tty->ldisc.ops->num == ldisc) {
+                tty_ldisc_put(new_ldisc.ops);
                 return 0;
         }
 
@@ -1024,7 +1119,7 @@ restart:
                         /* Free the new ldisc we grabbed. Must drop the lock
                            first. */
                         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-                        tty_ldisc_put(ldisc);
+                        tty_ldisc_put(o_ldisc.ops);
                         /*
                          * There are several reasons we may be busy, including
                          * random momentary I/O traffic. We must therefore
@@ -1038,7 +1133,7 @@ restart:
                 }
                 if (o_tty && o_tty->ldisc.refcount) {
                         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-                        tty_ldisc_put(ldisc);
+                        tty_ldisc_put(o_tty->ldisc.ops);
                         if (wait_event_interruptible(tty_ldisc_wait, o_tty->ldisc.refcount == 0) < 0)
                                 return -ERESTARTSYS;
                         goto restart;
@@ -1049,8 +1144,9 @@ restart:
          *      another ldisc change
          */
         if (!test_bit(TTY_LDISC, &tty->flags)) {
+                struct tty_ldisc *ld;
                 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-                tty_ldisc_put(ldisc);
+                tty_ldisc_put(new_ldisc.ops);
                 ld = tty_ldisc_ref_wait(tty);
                 tty_ldisc_deref(ld);
                 goto restart;
@@ -1060,7 +1156,7 @@ restart:
         if (o_tty)
                 clear_bit(TTY_LDISC, &o_tty->flags);
         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-
+        
         /*
          *      From this point on we know nobody has an ldisc
          *      usage reference, nor can they obtain one until
@@ -1070,45 +1166,30 @@ restart:
         work = cancel_delayed_work(&tty->buf.work);
         /*
          * Wait for ->hangup_work and ->buf.work handlers to terminate
+         * MUST NOT hold locks here.
          */
         flush_scheduled_work();
         /* Shutdown the current discipline. */
-        if (tty->ldisc.close)
-                (tty->ldisc.close)(tty);
+        if (o_ldisc.ops->close)
+                (o_ldisc.ops->close)(tty);
 
         /* Now set up the new line discipline. */
-        tty_ldisc_assign(tty, ld);
+        tty_ldisc_assign(tty, &new_ldisc);
         tty_set_termios_ldisc(tty, ldisc);
-        if (tty->ldisc.open)
-                retval = (tty->ldisc.open)(tty);
+        if (new_ldisc.ops->open)
+                retval = (new_ldisc.ops->open)(tty);
         if (retval < 0) {
-                tty_ldisc_put(ldisc);
-                /* There is an outstanding reference here so this is safe */
-                tty_ldisc_assign(tty, tty_ldisc_get(o_ldisc.num));
-                tty_set_termios_ldisc(tty, tty->ldisc.num);
-                if (tty->ldisc.open && (tty->ldisc.open(tty) < 0)) {
-                        tty_ldisc_put(o_ldisc.num);
-                        /* This driver is always present */
-                        tty_ldisc_assign(tty, tty_ldisc_get(N_TTY));
-                        tty_set_termios_ldisc(tty, N_TTY);
-                        if (tty->ldisc.open) {
-                                int r = tty->ldisc.open(tty);
-
-                                if (r < 0)
-                                        panic("Couldn't open N_TTY ldisc for "
-                                              "%s --- error %d.",
-                                              tty_name(tty, buf), r);
-                        }
-                }
+                tty_ldisc_put(new_ldisc.ops);
+                tty_ldisc_restore(tty, &o_ldisc);
         }
         /* At this point we hold a reference to the new ldisc and a
            a reference to the old ldisc. If we ended up flipping back
            to the existing ldisc we have two references to it */
 
-        if (tty->ldisc.num != o_ldisc.num && tty->ops->set_ldisc)
+        if (tty->ldisc.ops->num != o_ldisc.ops->num && tty->ops->set_ldisc)
                 tty->ops->set_ldisc(tty);
 
-        tty_ldisc_put(o_ldisc.num);
+        tty_ldisc_put(o_ldisc.ops);
 
         /*
          *      Allow ldisc referencing to occur as soon as the driver
@@ -1335,8 +1416,8 @@ void tty_wakeup(struct tty_struct *tty)
         if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags)) {
                 ld = tty_ldisc_ref(tty);
                 if (ld) {
-                        if (ld->write_wakeup)
-                                ld->write_wakeup(tty);
+                        if (ld->ops->write_wakeup)
+                                ld->ops->write_wakeup(tty);
                         tty_ldisc_deref(ld);
                 }
         }
@@ -1357,8 +1438,8 @@ void tty_ldisc_flush(struct tty_struct *tty)
 {
         struct tty_ldisc *ld = tty_ldisc_ref(tty);
         if (ld) {
-                if (ld->flush_buffer)
-                        ld->flush_buffer(tty);
+                if (ld->ops->flush_buffer)
+                        ld->ops->flush_buffer(tty);
                 tty_ldisc_deref(ld);
         }
         tty_buffer_flush(tty);
@@ -1386,7 +1467,7 @@ static void tty_reset_termios(struct tty_struct *tty)
  *      do_tty_hangup           -       actual handler for hangup events
  *      @work: tty device
  *
- *      This can be called by the "eventd" kernel thread.  That is process
+k *     This can be called by the "eventd" kernel thread.  That is process
  *      synchronous but doesn't hold any locks, so we need to make sure we
  *      have the appropriate locks for what we're doing.
  *
@@ -1449,14 +1530,14 @@ static void do_tty_hangup(struct work_struct *work)
         ld = tty_ldisc_ref(tty);
         if (ld != NULL) {
                 /* We may have no line discipline at this point */
-                if (ld->flush_buffer)
-                        ld->flush_buffer(tty);
+                if (ld->ops->flush_buffer)
+                        ld->ops->flush_buffer(tty);
                 tty_driver_flush_buffer(tty);
                 if ((test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags)) &&
-                    ld->write_wakeup)
-                        ld->write_wakeup(tty);
-                if (ld->hangup)
-                        ld->hangup(tty);
+                    ld->ops->write_wakeup)
+                        ld->ops->write_wakeup(tty);
+                if (ld->ops->hangup)
+                        ld->ops->hangup(tty);
         }
         /*
          * FIXME: Once we trust the LDISC code better we can wait here for
@@ -1825,8 +1906,8 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
         /* We want to wait for the line discipline to sort out in this
            situation */
         ld = tty_ldisc_ref_wait(tty);
-        if (ld->read)
-                i = (ld->read)(tty, file, buf, count);
+        if (ld->ops->read)
+                i = (ld->ops->read)(tty, file, buf, count);
         else
                 i = -EIO;
         tty_ldisc_deref(ld);
@@ -1978,10 +2059,10 @@ static ssize_t tty_write(struct file *file, const char __user *buf,
                 printk(KERN_ERR "tty driver %s lacks a write_room method.\n",
                         tty->driver->name);
         ld = tty_ldisc_ref_wait(tty);
-        if (!ld->write)
+        if (!ld->ops->write)
                 ret = -EIO;
         else
-                ret = do_tty_write(ld->write, tty, file, buf, count);
+                ret = do_tty_write(ld->ops->write, tty, file, buf, count);
         tty_ldisc_deref(ld);
         return ret;
 }
@@ -2007,6 +2088,42 @@ ssize_t redirected_tty_write(struct file *file, const char __user *buf,
         return tty_write(file, buf, count, ppos);
 }
 
+void tty_port_init(struct tty_port *port)
+{
+        memset(port, 0, sizeof(*port));
+        init_waitqueue_head(&port->open_wait);
+        init_waitqueue_head(&port->close_wait);
+        mutex_init(&port->mutex);
+        port->close_delay = (50 * HZ) / 100;
+        port->closing_wait = (3000 * HZ) / 100;
+}
+EXPORT_SYMBOL(tty_port_init);
+
+int tty_port_alloc_xmit_buf(struct tty_port *port)
+{
+        /* We may sleep in get_zeroed_page() */
+        mutex_lock(&port->mutex);
+        if (port->xmit_buf == NULL)
+                port->xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);
+        mutex_unlock(&port->mutex);
+        if (port->xmit_buf == NULL)
+                return -ENOMEM;
+        return 0;
+}
+EXPORT_SYMBOL(tty_port_alloc_xmit_buf);
+
+void tty_port_free_xmit_buf(struct tty_port *port)
+{
+        mutex_lock(&port->mutex);
+        if (port->xmit_buf != NULL) {
+                free_page((unsigned long)port->xmit_buf);
+                port->xmit_buf = NULL;
+        }
+        mutex_unlock(&port->mutex);
+}
+EXPORT_SYMBOL(tty_port_free_xmit_buf);
+
+
 static char ptychar[] = "pqrstuvwxyzabcde";
 
 /**
@@ -2076,6 +2193,7 @@ static int init_dev(struct tty_driver *driver, int idx,
         struct ktermios *tp, **tp_loc, *o_tp, **o_tp_loc;
         struct ktermios *ltp, **ltp_loc, *o_ltp, **o_ltp_loc;
         int retval = 0;
+        struct tty_ldisc *ld;
 
         /* check whether we're reopening an existing tty */
         if (driver->flags & TTY_DRIVER_DEVPTS_MEM) {
@@ -2224,17 +2342,19 @@ static int init_dev(struct tty_driver *driver, int idx,
          * If we fail here just call release_tty to clean up.  No need
          * to decrement the use counts, as release_tty doesn't care.
          */
+         
+        ld = &tty->ldisc;
 
-        if (tty->ldisc.open) {
-                retval = (tty->ldisc.open)(tty);
+        if (ld->ops->open) {
+                retval = (ld->ops->open)(tty);
                 if (retval)
                         goto release_mem_out;
         }
-        if (o_tty && o_tty->ldisc.open) {
-                retval = (o_tty->ldisc.open)(o_tty);
+        if (o_tty && o_tty->ldisc.ops->open) {
+                retval = (o_tty->ldisc.ops->open)(o_tty);
                 if (retval) {
-                        if (tty->ldisc.close)
-                                (tty->ldisc.close)(tty);
+                        if (ld->ops->close)
+                                (ld->ops->close)(tty);
                         goto release_mem_out;
                 }
                 tty_ldisc_enable(o_tty);
@@ -2378,6 +2498,7 @@ static void release_tty(struct tty_struct *tty, int idx)
 static void release_dev(struct file *filp)
 {
         struct tty_struct *tty, *o_tty;
+        struct tty_ldisc ld;
         int     pty_master, tty_closing, o_tty_closing, do_sleep;
         int     devpts;
         int     idx;
@@ -2611,26 +2732,27 @@ static void release_dev(struct file *filp)
         spin_unlock_irqrestore(&tty_ldisc_lock, flags);
         /*
          * Shutdown the current line discipline, and reset it to N_TTY.
-         * N.B. why reset ldisc when we're releasing the memory??
          *
          * FIXME: this MUST get fixed for the new reflocking
          */
-        if (tty->ldisc.close)
-                (tty->ldisc.close)(tty);
-        tty_ldisc_put(tty->ldisc.num);
+        if (tty->ldisc.ops->close)
+                (tty->ldisc.ops->close)(tty);
+        tty_ldisc_put(tty->ldisc.ops);
 
         /*
          *      Switch the line discipline back
          */
-        tty_ldisc_assign(tty, tty_ldisc_get(N_TTY));
+        WARN_ON(tty_ldisc_get(N_TTY, &ld));
+        tty_ldisc_assign(tty, &ld);
         tty_set_termios_ldisc(tty, N_TTY);
         if (o_tty) {
                 /* FIXME: could o_tty be in setldisc here ? */
                 clear_bit(TTY_LDISC, &o_tty->flags);
-                if (o_tty->ldisc.close)
-                        (o_tty->ldisc.close)(o_tty);
-                tty_ldisc_put(o_tty->ldisc.num);
-                tty_ldisc_assign(o_tty, tty_ldisc_get(N_TTY));
+                if (o_tty->ldisc.ops->close)
+                        (o_tty->ldisc.ops->close)(o_tty);
+                tty_ldisc_put(o_tty->ldisc.ops);
+                WARN_ON(tty_ldisc_get(N_TTY, &ld));
+                tty_ldisc_assign(o_tty, &ld);
                 tty_set_termios_ldisc(o_tty, N_TTY);
         }
         /*
@@ -2899,8 +3021,8 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait)
                 return 0;
 
         ld = tty_ldisc_ref_wait(tty);
-        if (ld->poll)
-                ret = (ld->poll)(tty, filp, wait);
+        if (ld->ops->poll)
+                ret = (ld->ops->poll)(tty, filp, wait);
         tty_ldisc_deref(ld);
         return ret;
 }
@@ -2974,7 +3096,7 @@ static int tiocsti(struct tty_struct *tty, char __user *p)
         if (get_user(ch, p))
                 return -EFAULT;
         ld = tty_ldisc_ref_wait(tty);
-        ld->receive_buf(tty, &ch, &mbz, 1);
+        ld->ops->receive_buf(tty, &ch, &mbz, 1);
         tty_ldisc_deref(ld);
         return 0;
 }
@@ -3395,35 +3517,31 @@ static int tty_tiocmget(struct tty_struct *tty, struct file *file, int __user *p
 static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int cmd,
              unsigned __user *p)
 {
-        int retval = -EINVAL;
-
-        if (tty->ops->tiocmset) {
-                unsigned int set, clear, val;
-
-                retval = get_user(val, p);
-                if (retval)
-                        return retval;
-
-                set = clear = 0;
-                switch (cmd) {
-                case TIOCMBIS:
-                        set = val;
-                        break;
-                case TIOCMBIC:
-                        clear = val;
-                        break;
-                case TIOCMSET:
-                        set = val;
-                        clear = ~val;
-                        break;
-                }
+        int retval;
+        unsigned int set, clear, val;
 
-                set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
-                clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
+        if (tty->ops->tiocmset == NULL)
+                return -EINVAL;
 
-                retval = tty->ops->tiocmset(tty, file, set, clear);
+        retval = get_user(val, p);
+        if (retval)
+                return retval;
+        set = clear = 0;
+        switch (cmd) {
+        case TIOCMBIS:
+                set = val;
+                break;
+        case TIOCMBIC:
+                clear = val;
+                break;
+        case TIOCMSET:
+                set = val;
+                clear = ~val;
+                break;
         }
-        return retval;
+        set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
+        clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
+        return tty->ops->tiocmset(tty, file, set, clear);
 }
 
 /*
@@ -3528,7 +3646,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case TIOCGSID:
                 return tiocgsid(tty, real_tty, p);
         case TIOCGETD:
-                return put_user(tty->ldisc.num, (int __user *)p);
+                return put_user(tty->ldisc.ops->num, (int __user *)p);
         case TIOCSETD:
                 return tiocsetd(tty, p);
 #ifdef CONFIG_VT
@@ -3581,8 +3699,8 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         }
         ld = tty_ldisc_ref_wait(tty);
         retval = -EINVAL;
-        if (ld->ioctl) {
-                retval = ld->ioctl(tty, file, cmd, arg);
+        if (ld->ops->ioctl) {
+                retval = ld->ops->ioctl(tty, file, cmd, arg);
                 if (retval == -ENOIOCTLCMD)
                         retval = -EINVAL;
         }
@@ -3609,8 +3727,8 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
         }
 
         ld = tty_ldisc_ref_wait(tty);
-        if (ld->compat_ioctl)
-                retval = ld->compat_ioctl(tty, file, cmd, arg);
+        if (ld->ops->compat_ioctl)
+                retval = ld->ops->compat_ioctl(tty, file, cmd, arg);
         tty_ldisc_deref(ld);
 
         return retval;
@@ -3782,7 +3900,8 @@ static void flush_to_ldisc(struct work_struct *work)
                         flag_buf = head->flag_buf_ptr + head->read;
                         head->read += count;
                         spin_unlock_irqrestore(&tty->buf.lock, flags);
-                        disc->receive_buf(tty, char_buf, flag_buf, count);
+                        disc->ops->receive_buf(tty, char_buf,
+                                                        flag_buf, count);
                         spin_lock_irqsave(&tty->buf.lock, flags);
                 }
                 /* Restore the queue head */
@@ -3843,9 +3962,12 @@ EXPORT_SYMBOL(tty_flip_buffer_push);
 
 static void initialize_tty_struct(struct tty_struct *tty)
 {
+        struct tty_ldisc ld;
         memset(tty, 0, sizeof(struct tty_struct));
         tty->magic = TTY_MAGIC;
-        tty_ldisc_assign(tty, tty_ldisc_get(N_TTY));
+        if (tty_ldisc_get(N_TTY, &ld) < 0)
+                panic("n_tty: init_tty");
+        tty_ldisc_assign(tty, &ld);
         tty->session = NULL;
         tty->pgrp = NULL;
         tty->overrun_time = jiffies;
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 8f81139d6194..ea9fc5d03b99 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -491,8 +491,8 @@ static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
 
         ld = tty_ldisc_ref(tty);
         if (ld != NULL) {
-                if (ld->set_termios)
-                        (ld->set_termios)(tty, &old_termios);
+                if (ld->ops->set_termios)
+                        (ld->ops->set_termios)(tty, &old_termios);
                 tty_ldisc_deref(ld);
         }
         mutex_unlock(&tty->termios_mutex);
@@ -552,8 +552,8 @@ static int set_termios(struct tty_struct *tty, void __user *arg, int opt)
         ld = tty_ldisc_ref(tty);
 
         if (ld != NULL) {
-                if ((opt & TERMIOS_FLUSH) && ld->flush_buffer)
-                        ld->flush_buffer(tty);
+                if ((opt & TERMIOS_FLUSH) && ld->ops->flush_buffer)
+                        ld->ops->flush_buffer(tty);
                 tty_ldisc_deref(ld);
         }
 
@@ -959,12 +959,12 @@ int tty_perform_flush(struct tty_struct *tty, unsigned long arg)
         ld = tty_ldisc_ref(tty);
         switch (arg) {
         case TCIFLUSH:
-                if (ld && ld->flush_buffer)
-                        ld->flush_buffer(tty);
+                if (ld && ld->ops->flush_buffer)
+                        ld->ops->flush_buffer(tty);
                 break;
         case TCIOFLUSH:
-                if (ld && ld->flush_buffer)
-                        ld->flush_buffer(tty);
+                if (ld && ld->ops->flush_buffer)
+                        ld->ops->flush_buffer(tty);
                 /* fall through */
         case TCOFLUSH:
                 tty_driver_flush_buffer(tty);
diff --git a/drivers/dio/dio-driver.c b/drivers/dio/dio-driver.c
index 8cd8507b1a8a..9c0c9afcd0ac 100644
--- a/drivers/dio/dio-driver.c
+++ b/drivers/dio/dio-driver.c
@@ -119,19 +119,7 @@ static int dio_bus_match(struct device *dev, struct device_driver *drv)
         if (!ids)
                 return 0;
 
-        while (ids->id) {
-                if (ids->id == DIO_WILDCARD)
-                        return 1;
-                if (DIO_NEEDSSECID(ids->id & 0xff)) {
-                        if (ids->id == d->id)
-                                return 1;
-                } else {
-                        if ((ids->id & 0xff) == (d->id & 0xff))
-                                return 1;
-                }
-                ids++;
-        }
-        return 0;
+        return dio_match_device(ids, d) ? 1 : 0;
 }
 
 
diff --git a/drivers/input/keyboard/atakbd.c b/drivers/input/keyboard/atakbd.c
index 4e92100c56a8..1839194ea987 100644
--- a/drivers/input/keyboard/atakbd.c
+++ b/drivers/input/keyboard/atakbd.c
@@ -220,7 +220,7 @@ static int __init atakbd_init(void)
         int i, error;
 
         if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
-                return -EIO;
+                return -ENODEV;
 
         // need to init core driver if not already done so
         if (atari_keyb_init())
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 7ff71ba7b7c9..b9694b6445d0 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -216,7 +216,7 @@ static void serport_ldisc_write_wakeup(struct tty_struct * tty)
  * The line discipline structure.
  */
 
-static struct tty_ldisc serport_ldisc = {
+static struct tty_ldisc_ops serport_ldisc = {
         .owner =        THIS_MODULE,
         .name =         "input",
         .open =         serport_ldisc_open,
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 2095153582f1..8a35029caca0 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -466,7 +466,7 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb)
         ld = tty_ldisc_ref(mp->tty);
         if (ld == NULL)
                 return -1;
-        if (ld->receive_buf == NULL) {
+        if (ld->ops->receive_buf == NULL) {
 #if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS)
                 printk(KERN_DEBUG "capi: ldisc has no receive_buf function\n");
 #endif
@@ -501,7 +501,7 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb)
         printk(KERN_DEBUG "capi: DATA_B3_RESP %u len=%d => ldisc\n",
                                 datahandle, skb->len);
 #endif
-        ld->receive_buf(mp->tty, skb->data, NULL, skb->len);
+        ld->ops->receive_buf(mp->tty, skb->data, NULL, skb->len);
         kfree_skb(skb);
         tty_ldisc_deref(ld);
         return 0;
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 45d1ee93cd39..5e89fa177816 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -766,7 +766,7 @@ gigaset_tty_wakeup(struct tty_struct *tty)
         cs_put(cs);
 }
 
-static struct tty_ldisc gigaset_ldisc = {
+static struct tty_ldisc_ops gigaset_ldisc = {
         .owner          = THIS_MODULE,
         .magic          = TTY_LDISC_MAGIC,
         .name           = "ser_gigaset",
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 611e9fb18b67..3e5e64c33e18 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -325,15 +325,6 @@ config APNE
           To compile this driver as a module, choose M here: the module
           will be called apne.
 
-config APOLLO_ELPLUS
-        tristate "Apollo 3c505 support"
-        depends on APOLLO
-        help
-          Say Y or M here if your Apollo has a 3Com 3c505 ISA Ethernet card.
-          If you don't have one made for Apollos, you can use one from a PC,
-          except that your Apollo won't be able to boot from it (because the
-          code in the ROM will be for a PC).
-
 config MAC8390
         bool "Macintosh NS 8390 based ethernet cards"
         depends on MAC
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 10f3a196be32..29e53eb71c74 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -98,7 +98,6 @@ struct ariadne_private {
     volatile u_short *rx_buff[RX_RING_SIZE];
     int cur_tx, cur_rx;                 /* The next free ring entry */
     int dirty_tx;                       /* The ring entries to be free()ed. */
-    struct net_device_stats stats;
     char tx_full;
 };
 
@@ -378,20 +377,19 @@ static void ariadne_init_ring(struct net_device *dev)
 
 static int ariadne_close(struct net_device *dev)
 {
-    struct ariadne_private *priv = netdev_priv(dev);
     volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr;
 
     netif_stop_queue(dev);
 
     lance->RAP = CSR112;        /* Missed Frame Count */
-    priv->stats.rx_missed_errors = swapw(lance->RDP);
+    dev->stats.rx_missed_errors = swapw(lance->RDP);
     lance->RAP = CSR0;          /* PCnet-ISA Controller Status */
 
     if (ariadne_debug > 1) {
         printk(KERN_DEBUG "%s: Shutting down ethercard, status was %2.2x.\n",
                dev->name, lance->RDP);
         printk(KERN_DEBUG "%s: %lu packets missed\n", dev->name,
-               priv->stats.rx_missed_errors);
+               dev->stats.rx_missed_errors);
     }
 
     /* We stop the LANCE here -- it occasionally polls memory if we don't. */
@@ -502,16 +500,16 @@ static irqreturn_t ariadne_interrupt(int irq, void *data)
                 if (status & TF_ERR) {
                     /* There was an major error, log it. */
                     int err_status = priv->tx_ring[entry]->TMD3;
-                    priv->stats.tx_errors++;
+                    dev->stats.tx_errors++;
                     if (err_status & EF_RTRY)
-                        priv->stats.tx_aborted_errors++;
+                        dev->stats.tx_aborted_errors++;
                     if (err_status & EF_LCAR)
-                        priv->stats.tx_carrier_errors++;
+                        dev->stats.tx_carrier_errors++;
                     if (err_status & EF_LCOL)
-                        priv->stats.tx_window_errors++;
+                        dev->stats.tx_window_errors++;
                     if (err_status & EF_UFLO) {
                         /* Ackk!  On FIFO errors the Tx unit is turned off! */
-                        priv->stats.tx_fifo_errors++;
+                        dev->stats.tx_fifo_errors++;
                         /* Remove this verbosity later! */
                         printk(KERN_ERR "%s: Tx FIFO error! Status %4.4x.\n",
                                dev->name, csr0);
@@ -520,8 +518,8 @@ static irqreturn_t ariadne_interrupt(int irq, void *data)
                     }
                 } else {
                     if (status & (TF_MORE|TF_ONE))
-                        priv->stats.collisions++;
-                    priv->stats.tx_packets++;
+                        dev->stats.collisions++;
+                    dev->stats.tx_packets++;
                 }
                 dirty_tx++;
             }
@@ -547,11 +545,11 @@ static irqreturn_t ariadne_interrupt(int irq, void *data)
         /* Log misc errors. */
         if (csr0 & BABL) {
             handled = 1;
-            priv->stats.tx_errors++;    /* Tx babble. */
+            dev->stats.tx_errors++;     /* Tx babble. */
         }
         if (csr0 & MISS) {
             handled = 1;
-            priv->stats.rx_errors++;    /* Missed a Rx frame. */
+            dev->stats.rx_errors++;     /* Missed a Rx frame. */
         }
         if (csr0 & MERR) {
             handled = 1;
@@ -672,7 +670,7 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
         priv->cur_tx -= TX_RING_SIZE;
         priv->dirty_tx -= TX_RING_SIZE;
     }
-    priv->stats.tx_bytes += len;
+    dev->stats.tx_bytes += len;
 
     /* Trigger an immediate send poll. */
     lance->RAP = CSR0;          /* PCnet-ISA Controller Status */
@@ -707,15 +705,15 @@ static int ariadne_rx(struct net_device *dev)
                 buffers, with only the last correctly noting the error. */
             if (status & RF_ENP)
                 /* Only count a general error at the end of a packet.*/
-                priv->stats.rx_errors++;
+                dev->stats.rx_errors++;
             if (status & RF_FRAM)
-                priv->stats.rx_frame_errors++;
+                dev->stats.rx_frame_errors++;
             if (status & RF_OFLO)
-                priv->stats.rx_over_errors++;
+                dev->stats.rx_over_errors++;
             if (status & RF_CRC)
-                priv->stats.rx_crc_errors++;
+                dev->stats.rx_crc_errors++;
             if (status & RF_BUFF)
-                priv->stats.rx_fifo_errors++;
+                dev->stats.rx_fifo_errors++;
             priv->rx_ring[entry]->RMD1 &= 0xff00|RF_STP|RF_ENP;
         } else {
             /* Malloc up new buffer, compatible with net-3. */
@@ -731,7 +729,7 @@ static int ariadne_rx(struct net_device *dev)
                         break;
 
                 if (i > RX_RING_SIZE-2) {
-                    priv->stats.rx_dropped++;
+                    dev->stats.rx_dropped++;
                     priv->rx_ring[entry]->RMD1 |= RF_OWN;
                     priv->cur_rx++;
                 }
@@ -764,8 +762,8 @@ static int ariadne_rx(struct net_device *dev)
 
             netif_rx(skb);
             dev->last_rx = jiffies;
-            priv->stats.rx_packets++;
-            priv->stats.rx_bytes += pkt_len;
+            dev->stats.rx_packets++;
+            dev->stats.rx_bytes += pkt_len;
         }
 
         priv->rx_ring[entry]->RMD1 |= RF_OWN;
@@ -783,7 +781,6 @@ static int ariadne_rx(struct net_device *dev)
 
 static struct net_device_stats *ariadne_get_stats(struct net_device *dev)
 {
-    struct ariadne_private *priv = netdev_priv(dev);
     volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr;
     short saved_addr;
     unsigned long flags;
@@ -791,11 +788,11 @@ static struct net_device_stats *ariadne_get_stats(struct net_device *dev)
     local_irq_save(flags);
     saved_addr = lance->RAP;
     lance->RAP = CSR112;                /* Missed Frame Count */
-    priv->stats.rx_missed_errors = swapw(lance->RDP);
+    dev->stats.rx_missed_errors = swapw(lance->RDP);
     lance->RAP = saved_addr;
     local_irq_restore(flags);
 
-    return &priv->stats;
+    return &dev->stats;
 }
 
 
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index ffc937f5d15d..0f501d2ca935 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -775,7 +775,7 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file,
         return err;
 }
 
-static struct tty_ldisc sp_ldisc = {
+static struct tty_ldisc_ops sp_ldisc = {
         .owner          = THIS_MODULE,
         .magic          = TTY_LDISC_MAGIC,
         .name           = "6pack",
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index b8740e6a5cec..3249df5e0f17 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -971,7 +971,7 @@ out:
         mkiss_put(ax);
 }
 
-static struct tty_ldisc ax_ldisc = {
+static struct tty_ldisc_ops ax_ldisc = {
         .owner          = THIS_MODULE,
         .magic          = TTY_LDISC_MAGIC,
         .name           = "mkiss",
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index e6f40b7f9041..9e33196f9459 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -533,7 +533,7 @@ static void irtty_close(struct tty_struct *tty)
 
 /* ------------------------------------------------------- */
 
-static struct tty_ldisc irda_ldisc = {
+static struct tty_ldisc_ops irda_ldisc = {
         .magic          = TTY_LDISC_MAGIC,
         .name           = "irda",
         .flags          = 0,
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 387a13395015..e13966bb5f77 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -585,9 +585,8 @@ static struct config_item_type netconsole_target_type = {
  * Group operations and type for netconsole_subsys.
  */
 
-static int make_netconsole_target(struct config_group *group,
-                                  const char *name,
-                                  struct config_item **new_item)
+static struct config_item *make_netconsole_target(struct config_group *group,
+                                                  const char *name)
 {
         unsigned long flags;
         struct netconsole_target *nt;
@@ -599,7 +598,7 @@ static int make_netconsole_target(struct config_group *group,
         nt = kzalloc(sizeof(*nt), GFP_KERNEL);
         if (!nt) {
                 printk(KERN_ERR "netconsole: failed to allocate memory\n");
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
         }
 
         nt->np.name = "netconsole";
@@ -616,8 +615,7 @@ static int make_netconsole_target(struct config_group *group,
         list_add(&nt->list, &target_list);
         spin_unlock_irqrestore(&target_list_lock, flags);
 
-        *new_item = &nt->item;
-        return 0;
+        return &nt->item;
 }
 
 static void drop_netconsole_target(struct config_group *group,
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index f1a52def1241..451bdb57d6fc 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -378,7 +378,7 @@ ppp_asynctty_wakeup(struct tty_struct *tty)
 }
 
 
-static struct tty_ldisc ppp_ldisc = {
+static struct tty_ldisc_ops ppp_ldisc = {
         .owner  = THIS_MODULE,
         .magic  = TTY_LDISC_MAGIC,
         .name   = "ppp",
diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c
index b8f0369a71e7..801d8f99d471 100644
--- a/drivers/net/ppp_synctty.c
+++ b/drivers/net/ppp_synctty.c
@@ -418,7 +418,7 @@ ppp_sync_wakeup(struct tty_struct *tty)
 }
 
 
-static struct tty_ldisc ppp_sync_ldisc = {
+static struct tty_ldisc_ops ppp_sync_ldisc = {
         .owner  = THIS_MODULE,
         .magic  = TTY_LDISC_MAGIC,
         .name   = "pppsync",
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 84af68fdb6c2..1d58991d395b 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -1301,7 +1301,7 @@ static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 #endif
 /* VSV changes end */
 
-static struct tty_ldisc sl_ldisc = {
+static struct tty_ldisc_ops sl_ldisc = {
         .owner          = THIS_MODULE,
         .magic          = TTY_LDISC_MAGIC,
         .name           = "slip",
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index eae94ab6b818..4518d0aa2480 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -688,9 +688,9 @@ static void cpc_tty_rx_work(struct work_struct *work)
                                 if (cpc_tty->tty) {
                                         ld = tty_ldisc_ref(cpc_tty->tty);
                                         if (ld) {
-                                                if (ld->receive_buf) {
+                                                if (ld->ops->receive_buf) {
                                                         CPC_TTY_DBG("%s: call line disc. receive_buf\n",cpc_tty->name);
-                                                        ld->receive_buf(cpc_tty->tty, (char *)(buf->data), &flags, buf->size);
+                                                        ld->ops->receive_buf(cpc_tty->tty, (char *)(buf->data), &flags, buf->size);
                                                 }
                                                 tty_ldisc_deref(ld);
                                         }
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 069f8bb0a99f..2a6c7a60756f 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -754,7 +754,7 @@ static void x25_asy_setup(struct net_device *dev)
         dev->flags              = IFF_NOARP;
 }
 
-static struct tty_ldisc x25_ldisc = {
+static struct tty_ldisc_ops x25_ldisc = {
         .owner          = THIS_MODULE,
         .magic          = TTY_LDISC_MAGIC,
         .name           = "X.25",
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 883af891ebfb..417e9e675fac 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -2728,7 +2728,7 @@ static int strip_ioctl(struct tty_struct *tty, struct file *file,
 /************************************************************************/
 /* Initialization                                                       */
 
-static struct tty_ldisc strip_ldisc = {
+static struct tty_ldisc_ops strip_ldisc = {
         .magic = TTY_LDISC_MAGIC,
         .name = "strip",
         .owner = THIS_MODULE,
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 0276471cb25e..6558a4037806 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -4,8 +4,6 @@
  * Driver for the serial port on the 21285 StrongArm-110 core logic chip.
  *
  * Based on drivers/char/serial.c
- *
- *  $Id: 21285.c,v 1.37 2002/07/28 10:03:27 rmk Exp $
  */
 #include <linux/module.h>
 #include <linux/tty.h>
@@ -88,7 +86,7 @@ static void serial21285_enable_ms(struct uart_port *port)
 static irqreturn_t serial21285_rx_chars(int irq, void *dev_id)
 {
         struct uart_port *port = dev_id;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         unsigned int status, ch, flag, rxs, max_count = 256;
 
         status = *CSR_UARTFLG;
@@ -237,8 +235,8 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios,
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
         quot = uart_get_divisor(port, baud);
 
-        if (port->info && port->info->tty) {
-                struct tty_struct *tty = port->info->tty;
+        if (port->info && port->info->port.tty) {
+                struct tty_struct *tty = port->info->port.tty;
                 unsigned int b = port->uartclk / (16 * quot);
                 tty_encode_baud_rate(tty, b, b);
         }
@@ -494,7 +492,7 @@ static int __init serial21285_init(void)
 {
         int ret;
 
-        printk(KERN_INFO "Serial: 21285 driver $Revision: 1.37 $\n");
+        printk(KERN_INFO "Serial: 21285 driver\n");
 
         serial21285_setup_ports();
 
@@ -515,5 +513,5 @@ module_init(serial21285_init);
 module_exit(serial21285_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver $Revision: 1.37 $");
+MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver");
 MODULE_ALIAS_CHARDEV(SERIAL_21285_MAJOR, SERIAL_21285_MINOR);
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index bbf5bc5892c7..381b12ac20e0 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -249,7 +249,7 @@ static void status_handle(struct m68k_serial *info, unsigned short status)
 {
 #if 0
         if(status & DCD) {
-                if((info->tty->termios->c_cflag & CRTSCTS) &&
+                if((info->port.tty->termios->c_cflag & CRTSCTS) &&
                    ((info->curregs[3] & AUTO_ENAB)==0)) {
                         info->curregs[3] |= AUTO_ENAB;
                         info->pendregs[3] |= AUTO_ENAB;
@@ -274,7 +274,7 @@ static void status_handle(struct m68k_serial *info, unsigned short status)
 
 static void receive_chars(struct m68k_serial *info, unsigned short rx)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         m68328_uart *uart = &uart_addr[info->line];
         unsigned char ch, flag;
 
@@ -345,7 +345,7 @@ static void transmit_chars(struct m68k_serial *info)
                 goto clear_and_return;
         }
 
-        if((info->xmit_cnt <= 0) || info->tty->stopped) {
+        if((info->xmit_cnt <= 0) || info->port.tty->stopped) {
                 /* That's peculiar... TX ints off */
                 uart->ustcnt &= ~USTCNT_TX_INTR_MASK;
                 goto clear_and_return;
@@ -403,7 +403,7 @@ static void do_softint(struct work_struct *work)
         struct m68k_serial      *info = container_of(work, struct m68k_serial, tqueue);
         struct tty_struct       *tty;
         
-        tty = info->tty;
+        tty = info->port.tty;
         if (!tty)
                 return;
 #if 0
@@ -427,7 +427,7 @@ static void do_serial_hangup(struct work_struct *work)
         struct m68k_serial      *info = container_of(work, struct m68k_serial, tqueue_hangup);
         struct tty_struct       *tty;
         
-        tty = info->tty;
+        tty = info->port.tty;
         if (!tty)
                 return;
 
@@ -471,8 +471,8 @@ static int startup(struct m68k_serial * info)
         uart->ustcnt = USTCNT_UEN | USTCNT_RXEN | USTCNT_RX_INTR_MASK;
 #endif
 
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
 
         /*
@@ -506,8 +506,8 @@ static void shutdown(struct m68k_serial * info)
                 info->xmit_buf = 0;
         }
 
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
         
         info->flags &= ~S_INITIALIZED;
         local_irq_restore(flags);
@@ -573,9 +573,9 @@ static void change_speed(struct m68k_serial *info)
         unsigned cflag;
         int     i;
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
-        cflag = info->tty->termios->c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
         if (!(port = info->port))
                 return;
 
@@ -1131,7 +1131,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
         tty_ldisc_flush(tty);
         tty->closing = 0;
         info->event = 0;
-        info->tty = 0;
+        info->port.tty = NULL;
 #warning "This is not and has never been valid so fix it"       
 #if 0
         if (tty->ldisc.num != ldiscs[N_TTY].num) {
@@ -1169,7 +1169,7 @@ void rs_hangup(struct tty_struct *tty)
         info->event = 0;
         info->count = 0;
         info->flags &= ~S_NORMAL_ACTIVE;
-        info->tty = 0;
+        info->port.tty = NULL;
         wake_up_interruptible(&info->open_wait);
 }
 
@@ -1286,7 +1286,7 @@ int rs_open(struct tty_struct *tty, struct file * filp)
 
         info->count++;
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
 
         /*
          * Start up serial port
@@ -1363,7 +1363,7 @@ rs68328_init(void)
             info = &m68k_soft[i];
             info->magic = SERIAL_MAGIC;
             info->port = (int) &uart_addr[i];
-            info->tty = 0;
+            info->port.tty = NULL;
             info->irq = uart_irqs[i];
             info->custom_divisor = 16;
             info->close_delay = 50;
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index d9d4e9552a4d..24661cd5e4fb 100644
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -393,7 +393,7 @@ static void rs_360_start(struct tty_struct *tty)
 
 static _INLINE_ void receive_chars(ser_info_t *info)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         unsigned char ch, flag, *cp;
         /*int   ignored = 0;*/
         int     i;
@@ -514,7 +514,7 @@ static _INLINE_ void receive_chars(ser_info_t *info)
 
 static _INLINE_ void receive_break(ser_info_t *info)
 {
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
 
         info->state->icount.brk++;
         /* Check to see if there is room in the tty buffer for
@@ -528,7 +528,7 @@ static _INLINE_ void transmit_chars(ser_info_t *info)
 {
 
         if ((info->flags & TX_WAKEUP) ||
-            (info->tty->flags & (1 << TTY_DO_WRITE_WAKEUP))) {
+            (info->port.tty->flags & (1 << TTY_DO_WRITE_WAKEUP))) {
                 schedule_work(&info->tqueue);
         }
 
@@ -584,12 +584,12 @@ static _INLINE_ void check_modem_status(struct async_struct *info)
                 }
         }
         if (info->flags & ASYNC_CTS_FLOW) {
-                if (info->tty->hw_stopped) {
+                if (info->port.tty->hw_stopped) {
                         if (status & UART_MSR_CTS) {
 #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
                                 printk("CTS tx start...");
 #endif
-                                info->tty->hw_stopped = 0;
+                                info->port.tty->hw_stopped = 0;
                                 info->IER |= UART_IER_THRI;
                                 serial_out(info, UART_IER, info->IER);
                                 rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
@@ -600,7 +600,7 @@ static _INLINE_ void check_modem_status(struct async_struct *info)
 #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
                                 printk("CTS tx stop...");
 #endif
-                                info->tty->hw_stopped = 1;
+                                info->port.tty->hw_stopped = 1;
                                 info->IER &= ~UART_IER_THRI;
                                 serial_out(info, UART_IER, info->IER);
                         }
@@ -670,7 +670,7 @@ static void do_softint(void *private_)
         ser_info_t      *info = (ser_info_t *) private_;
         struct tty_struct       *tty;
         
-        tty = info->tty;
+        tty = info->port.tty;
         if (!tty)
                 return;
 
@@ -693,7 +693,7 @@ static void do_serial_hangup(void *private_)
         struct async_struct     *info = (struct async_struct *) private_;
         struct tty_struct       *tty;
         
-        tty = info->tty;
+        tty = info->port.tty;
         if (!tty)
                 return;
 
@@ -721,8 +721,8 @@ static int startup(ser_info_t *info)
 
 #ifdef maybe
         if (!state->port || !state->type) {
-                if (info->tty)
-                        set_bit(TTY_IO_ERROR, &info->tty->flags);
+                if (info->port.tty)
+                        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
                 goto errout;
         }
 #endif
@@ -734,12 +734,12 @@ static int startup(ser_info_t *info)
 
 #ifdef modem_control
         info->MCR = 0;
-        if (info->tty->termios->c_cflag & CBAUD)
+        if (info->port.tty->termios->c_cflag & CBAUD)
                 info->MCR = UART_MCR_DTR | UART_MCR_RTS;
 #endif
         
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
         /*
          * and set the speed of the serial port
@@ -842,8 +842,8 @@ static void shutdown(ser_info_t *info)
                         smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
         }
         
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
         info->flags &= ~ASYNC_INITIALIZED;
         local_irq_restore(flags);
@@ -863,9 +863,9 @@ static void change_speed(ser_info_t *info)
         volatile struct smc_regs        *smcp;
         volatile struct scc_regs        *sccp;
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
-        cflag = info->tty->termios->c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
 
         state = info->state;
 
@@ -936,24 +936,24 @@ static void change_speed(ser_info_t *info)
          * Set up parity check flag
          */
         info->read_status_mask = (BD_SC_EMPTY | BD_SC_OV);
-        if (I_INPCK(info->tty))
+        if (I_INPCK(info->port.tty))
                 info->read_status_mask |= BD_SC_FR | BD_SC_PR;
-        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
+        if (I_BRKINT(info->port.tty) || I_PARMRK(info->port.tty))
                 info->read_status_mask |= BD_SC_BR;
         
         /*
          * Characters to ignore
          */
         info->ignore_status_mask = 0;
-        if (I_IGNPAR(info->tty))
+        if (I_IGNPAR(info->port.tty))
                 info->ignore_status_mask |= BD_SC_PR | BD_SC_FR;
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(info->port.tty)) {
                 info->ignore_status_mask |= BD_SC_BR;
                 /*
                  * If we're ignore parity and break indicators, ignore 
                  * overruns too.  (For real raw support).
                  */
-                if (I_IGNPAR(info->tty))
+                if (I_IGNPAR(info->port.tty))
                         info->ignore_status_mask |= BD_SC_OV;
         }
         /*
@@ -1658,7 +1658,7 @@ static void rs_360_close(struct tty_struct *tty, struct file * filp)
         tty_ldisc_flush(tty);           
         tty->closing = 0;
         info->event = 0;
-        info->tty = 0;
+        info->port.tty = NULL;
         if (info->blocked_open) {
                 if (info->close_delay) {
                         msleep_interruptible(jiffies_to_msecs(info->close_delay));
@@ -1758,7 +1758,7 @@ static void rs_360_hangup(struct tty_struct *tty)
         info->event = 0;
         state->count = 0;
         info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = 0;
+        info->port.tty = NULL;
         wake_up_interruptible(&info->open_wait);
 }
 
@@ -1919,7 +1919,7 @@ static int rs_360_open(struct tty_struct *tty, struct file * filp)
         printk("rs_open %s, count = %d\n", tty->name, info->state->count);
 #endif
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
 
         /*
          * Start up serial port
@@ -1976,7 +1976,7 @@ static inline int line_info(char *buf, struct serial_state *state)
                 info->port = state->port;
                 info->flags = state->flags;
                 info->quot = 0;
-                info->tty = 0;
+                info->port.tty = NULL;
         }
         local_irq_disable();
         status = serial_in(info, UART_MSR);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index be95e55b228b..ce948b66bbd4 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -12,8 +12,6 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *  $Id: 8250.c,v 1.90 2002/07/28 10:03:27 rmk Exp $
- *
  * A note about mapbase / membase
  *
  *  mapbase is the physical address of the IO port.
@@ -1289,7 +1287,7 @@ static void serial8250_enable_ms(struct uart_port *port)
 static void
 receive_chars(struct uart_8250_port *up, unsigned int *status)
 {
-        struct tty_struct *tty = up->port.info->tty;
+        struct tty_struct *tty = up->port.info->port.tty;
         unsigned char ch, lsr = *status;
         int max_count = 256;
         char flag;
@@ -2934,7 +2932,7 @@ static int __init serial8250_init(void)
         if (nr_uarts > UART_NR)
                 nr_uarts = UART_NR;
 
-        printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ "
+        printk(KERN_INFO "Serial: 8250/16550 driver"
                 "%d ports, IRQ sharing %sabled\n", nr_uarts,
                 share_irqs ? "en" : "dis");
 
@@ -2995,7 +2993,7 @@ EXPORT_SYMBOL(serial8250_suspend_port);
 EXPORT_SYMBOL(serial8250_resume_port);
 
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Generic 8250/16x50 serial driver $Revision: 1.90 $");
+MODULE_DESCRIPTION("Generic 8250/16x50 serial driver");
 
 module_param(share_irqs, uint, 0644);
 MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index 91bd28f2bb47..78c00162b04e 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -11,8 +11,6 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
- *  $Id: 8250.h,v 1.8 2002/07/21 21:32:30 rmk Exp $
  */
 
 #include <linux/serial_8250.h>
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 788c3559522d..1b36087665a2 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -10,8 +10,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License.
- *
- *  $Id: 8250_pci.c,v 1.28 2002/11/02 11:14:18 rmk Exp $
  */
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 638b68649e79..fde7f9ccf57e 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -12,8 +12,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License.
- *
- *  $Id: 8250_pnp.c,v 1.10 2002/07/21 21:32:30 rmk Exp $
  */
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 18ca9075e131..8fc7451c0049 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1,8 +1,6 @@
 #
 # Serial device configuration
 #
-# $Id: Kconfig,v 1.11 2004/03/11 18:08:04 lethal Exp $
-#
 
 menu "Serial drivers"
         depends on HAS_IOMEM
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 7d85c1fbe7e0..3a0bbbe17aa3 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -1,8 +1,6 @@
 #
 # Makefile for the kernel serial device drivers.
 #
-#  $Id: Makefile,v 1.8 2002/07/21 21:32:30 rmk Exp $
-#
 
 obj-$(CONFIG_SERIAL_CORE) += serial_core.o
 obj-$(CONFIG_SERIAL_21285) += 21285.o
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index e88da72f8304..90b56c2c31e2 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -22,8 +22,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: amba.c,v 1.41 2002/07/28 10:03:27 rmk Exp $
- *
  * This is a generic driver for ARM AMBA-type serial ports.  They
  * have a lot of 16550-like features, but are not register compatible.
  * Note that although they do have CTS, DCD and DSR inputs, they do
@@ -119,7 +117,7 @@ static void pl010_enable_ms(struct uart_port *port)
 
 static void pl010_rx_chars(struct uart_amba_port *uap)
 {
-        struct tty_struct *tty = uap->port.info->tty;
+        struct tty_struct *tty = uap->port.info->port.tty;
         unsigned int status, ch, flag, rsr, max_count = 256;
 
         status = readb(uap->port.membase + UART01x_FR);
@@ -791,7 +789,7 @@ static int __init pl010_init(void)
 {
         int ret;
 
-        printk(KERN_INFO "Serial: AMBA driver $Revision: 1.41 $\n");
+        printk(KERN_INFO "Serial: AMBA driver\n");
 
         ret = uart_register_driver(&amba_reg);
         if (ret == 0) {
@@ -812,5 +810,5 @@ module_init(pl010_init);
 module_exit(pl010_exit);
 
 MODULE_AUTHOR("ARM Ltd/Deep Blue Solutions Ltd");
-MODULE_DESCRIPTION("ARM AMBA serial port driver $Revision: 1.41 $");
+MODULE_DESCRIPTION("ARM AMBA serial port driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 08adc1de4a79..9d08f27208a1 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -22,8 +22,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: amba.c,v 1.41 2002/07/28 10:03:27 rmk Exp $
- *
  * This is a generic driver for ARM AMBA-type serial ports.  They
  * have a lot of 16550-like features, but are not register compatible.
  * Note that although they do have CTS, DCD and DSR inputs, they do
@@ -109,7 +107,7 @@ static void pl011_enable_ms(struct uart_port *port)
 
 static void pl011_rx_chars(struct uart_amba_port *uap)
 {
-        struct tty_struct *tty = uap->port.info->tty;
+        struct tty_struct *tty = uap->port.info->port.tty;
         unsigned int status, ch, flag, max_count = 256;
 
         status = readw(uap->port.membase + UART01x_FR);
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 6aeef22bd203..1fee12c1f4f8 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -662,14 +662,14 @@ static void atmel_rx_from_ring(struct uart_port *port)
          * uart_start(), which takes the lock.
          */
         spin_unlock(&port->lock);
-        tty_flip_buffer_push(port->info->tty);
+        tty_flip_buffer_push(port->info->port.tty);
         spin_lock(&port->lock);
 }
 
 static void atmel_rx_from_dma(struct uart_port *port)
 {
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         struct atmel_dma_buffer *pdc;
         int rx_idx = atmel_port->pdc_rx_idx;
         unsigned int head;
@@ -794,7 +794,7 @@ static void atmel_tasklet_func(unsigned long data)
 static int atmel_startup(struct uart_port *port)
 {
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         int retval;
 
         /*
@@ -956,6 +956,20 @@ static void atmel_shutdown(struct uart_port *port)
 }
 
 /*
+ * Flush any TX data submitted for DMA. Called when the TX circular
+ * buffer is reset.
+ */
+static void atmel_flush_buffer(struct uart_port *port)
+{
+        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
+
+        if (atmel_use_dma_tx(port)) {
+                UART_PUT_TCR(port, 0);
+                atmel_port->pdc_tx.ofs = 0;
+        }
+}
+
+/*
  * Power / Clock management.
  */
 static void atmel_serial_pm(struct uart_port *port, unsigned int state,
@@ -1189,6 +1203,7 @@ static struct uart_ops atmel_pops = {
         .break_ctl      = atmel_break_ctl,
         .startup        = atmel_startup,
         .shutdown       = atmel_shutdown,
+        .flush_buffer   = atmel_flush_buffer,
         .set_termios    = atmel_set_termios,
         .type           = atmel_type,
         .release_port   = atmel_release_port,
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index fd9bb777df28..9d8543762a30 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -175,7 +175,7 @@ int kgdb_get_debug_char(void)
 #ifdef CONFIG_SERIAL_BFIN_PIO
 static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
 {
-        struct tty_struct *tty = uart->port.info->tty;
+        struct tty_struct *tty = uart->port.info->port.tty;
         unsigned int status, ch, flg;
         static struct timeval anomaly_start = { .tv_sec = 0 };
 
@@ -393,7 +393,7 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
 
 static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
 {
-        struct tty_struct *tty = uart->port.info->tty;
+        struct tty_struct *tty = uart->port.info->port.tty;
         int i, flg, status;
 
         status = UART_GET_LSR(uart);
@@ -552,7 +552,7 @@ static void bfin_serial_mctrl_check(struct bfin_serial_port *uart)
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
         unsigned int status;
         struct uart_info *info = uart->port.info;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
 
         status = bfin_serial_get_mctrl(&uart->port);
         uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
@@ -814,10 +814,10 @@ static void bfin_serial_set_ldisc(struct uart_port *port)
         int line = port->line;
         unsigned short val;
 
-        if (line >= port->info->tty->driver->num)
+        if (line >= port->info->port.tty->driver->num)
                 return;
 
-        switch (port->info->tty->ldisc.num) {
+        switch (port->info->port.tty->ldisc.num) {
         case N_IRDA:
                 val = UART_GET_GCTL(&bfin_serial_ports[line]);
                 val |= (IREN | RPOLC);
diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/serial/bfin_sport_uart.c
index aca1240ad808..dd8564d25051 100644
--- a/drivers/serial/bfin_sport_uart.c
+++ b/drivers/serial/bfin_sport_uart.c
@@ -174,7 +174,7 @@ static int sport_uart_setup(struct sport_uart_port *up, int sclk, int baud_rate)
 static irqreturn_t sport_uart_rx_irq(int irq, void *dev_id)
 {
         struct sport_uart_port *up = dev_id;
-        struct tty_struct *tty = up->port.info->tty;
+        struct tty_struct *tty = up->port.info->port.tty;
         unsigned int ch;
 
         do {
@@ -201,7 +201,7 @@ static irqreturn_t sport_uart_tx_irq(int irq, void *dev_id)
 static irqreturn_t sport_uart_err_irq(int irq, void *dev_id)
 {
         struct sport_uart_port *up = dev_id;
-        struct tty_struct *tty = up->port.info->tty;
+        struct tty_struct *tty = up->port.info->port.tty;
         unsigned int stat = SPORT_GET_STAT(up);
 
         /* Overflow in RX FIFO */
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 23827189ec0e..fc1fa9267c59 100644
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -21,9 +21,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $
- *
  */
 
 #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -96,7 +93,7 @@ static void clps711xuart_enable_ms(struct uart_port *port)
 static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id)
 {
         struct uart_port *port = dev_id;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         unsigned int status, ch, flg;
 
         status = clps_readl(SYSFLG(port));
@@ -551,7 +548,7 @@ static int __init clps711xuart_init(void)
 {
         int ret, i;
 
-        printk(KERN_INFO "Serial: CLPS711x driver $Revision: 1.42 $\n");
+        printk(KERN_INFO "Serial: CLPS711x driver\n");
 
         ret = uart_register_driver(&clps711x_reg);
         if (ret)
@@ -577,6 +574,6 @@ module_init(clps711xuart_init);
 module_exit(clps711xuart_exit);
 
 MODULE_AUTHOR("Deep Blue Solutions Ltd");
-MODULE_DESCRIPTION("CLPS-711x generic serial driver $Revision: 1.42 $");
+MODULE_DESCRIPTION("CLPS-711x generic serial driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CHARDEV(SERIAL_CLPS711X_MAJOR, SERIAL_CLPS711X_MINOR);
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 3e0366eab412..8249ac490559 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -968,7 +968,7 @@ static DEFINE_MUTEX(tmp_buf_mutex);
 /* Calculate the chartime depending on baudrate, numbor of bits etc. */
 static void update_char_time(struct e100_serial * info)
 {
-        tcflag_t cflags = info->tty->termios->c_cflag;
+        tcflag_t cflags = info->port.tty->termios->c_cflag;
         int bits;
 
         /* calc. number of bits / data byte */
@@ -1483,7 +1483,8 @@ rs_stop(struct tty_struct *tty)
                                 CIRC_CNT(info->xmit.head,
                                          info->xmit.tail,SERIAL_XMIT_SIZE)));
 
-                xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(info->tty));
+                xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char,
+                                STOP_CHAR(info->port.tty));
                 xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, stop);
                 if (tty->termios->c_iflag & IXON ) {
                         xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);
@@ -1772,7 +1773,7 @@ add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char fl
 
                 info->icount.rx++;
         } else {
-                struct tty_struct *tty = info->tty;
+                struct tty_struct *tty = info->port.tty;
                 tty_insert_flip_char(tty, data, flag);
                 info->icount.rx++;
         }
@@ -1838,7 +1839,7 @@ static unsigned int handle_all_descr_data(struct e100_serial *info)
                 descr->status = 0;
 
                 DFLOW(  DEBUG_LOG(info->line, "RX %lu\n", recvl);
-                        if (info->tty->stopped) {
+                        if (info->port.tty->stopped) {
                                 unsigned char *buf = phys_to_virt(descr->buf);
                                 DEBUG_LOG(info->line, "rx 0x%02X\n", buf[0]);
                                 DEBUG_LOG(info->line, "rx 0x%02X\n", buf[1]);
@@ -1872,7 +1873,7 @@ static void receive_chars_dma(struct e100_serial *info)
                 IO_STATE(R_DMA_CH6_CLR_INTR, clr_descr, do) |
                 IO_STATE(R_DMA_CH6_CLR_INTR, clr_eop, do);
 
-        tty = info->tty;
+        tty = info->port.tty;
         if (!tty) /* Something wrong... */
                 return;
 
@@ -2122,7 +2123,7 @@ static void flush_to_flip_buffer(struct e100_serial *info)
         unsigned long flags;
 
         local_irq_save(flags);
-        tty = info->tty;
+        tty = info->port.tty;
 
         if (!tty) {
                 local_irq_restore(flags);
@@ -2287,7 +2288,7 @@ static
 struct e100_serial * handle_ser_rx_interrupt_no_dma(struct e100_serial *info)
 {
         unsigned long data_read;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
 
         if (!tty) {
                 printk("!NO TTY!\n");
@@ -2350,7 +2351,7 @@ more_data:
                                         data_in, data_read);
                                 char flag = TTY_NORMAL;
                                 if (info->errorcode == ERRCODE_INSERT_BREAK) {
-                                        struct tty_struct *tty = info->tty;
+                                        struct tty_struct *tty = info->port.tty;
                                         tty_insert_flip_char(tty, 0, flag);
                                         info->icount.rx++;
                                 }
@@ -2396,7 +2397,7 @@ more_data:
                 goto more_data;
         }
 
-        tty_flip_buffer_push(info->tty);
+        tty_flip_buffer_push(info->port.tty);
         return info;
 }
 
@@ -2547,8 +2548,8 @@ static void handle_ser_tx_interrupt(struct e100_serial *info)
                 rstat = info->port[REG_STATUS];
                 DFLOW(DEBUG_LOG(info->line, "stat %x\n", rstat));
                 e100_disable_serial_tx_ready_irq(info);
-                if (info->tty->stopped)
-                        rs_stop(info->tty);
+                if (info->port.tty->stopped)
+                        rs_stop(info->port.tty);
                 /* Enable the DMA channel and tell it to continue */
                 e100_enable_txdma_channel(info);
                 /* Wait 12 cycles before doing the DMA command */
@@ -2561,9 +2562,10 @@ static void handle_ser_tx_interrupt(struct e100_serial *info)
         }
         /* Normal char-by-char interrupt */
         if (info->xmit.head == info->xmit.tail
-            || info->tty->stopped
-            || info->tty->hw_stopped) {
-                DFLOW(DEBUG_LOG(info->line, "tx_int: stopped %i\n", info->tty->stopped));
+            || info->port.tty->stopped
+            || info->port.tty->hw_stopped) {
+                DFLOW(DEBUG_LOG(info->line, "tx_int: stopped %i\n",
+                                info->port.tty->stopped));
                 e100_disable_serial_tx_ready_irq(info);
                 info->tr_running = 0;
                 return;
@@ -2725,7 +2727,7 @@ do_softint(struct work_struct *work)
 
         info = container_of(work, struct e100_serial, work);
 
-        tty = info->tty;
+        tty = info->port.tty;
         if (!tty)
                 return;
 
@@ -2767,8 +2769,8 @@ startup(struct e100_serial * info)
         /* Bits and pieces collected from below.  Better to have them
            in one ifdef:ed clause than to mix in a lot of ifdefs,
            right? */
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
         info->xmit.head = info->xmit.tail = 0;
         info->first_recv_buffer = info->last_recv_buffer = NULL;
@@ -2825,8 +2827,8 @@ startup(struct e100_serial * info)
                 e100_disable_txdma_channel(info);
         }
 
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
         info->xmit.head = info->xmit.tail = 0;
         info->first_recv_buffer = info->last_recv_buffer = NULL;
@@ -2940,14 +2942,14 @@ shutdown(struct e100_serial * info)
                         descr[i].buf = 0;
                 }
 
-        if (!info->tty || (info->tty->termios->c_cflag & HUPCL)) {
+        if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL)) {
                 /* hang up DTR and RTS if HUPCL is enabled */
                 e100_dtr(info, 0);
                 e100_rts(info, 0); /* could check CRTSCTS before doing this */
         }
 
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
         info->flags &= ~ASYNC_INITIALIZED;
         local_irq_restore(flags);
@@ -2964,12 +2966,12 @@ change_speed(struct e100_serial *info)
         unsigned long flags;
         /* first some safety checks */
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
         if (!info->port)
                 return;
 
-        cflag = info->tty->termios->c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
 
         /* possibly, the tx/rx should be disabled first to do this safely */
 
@@ -3097,10 +3099,11 @@ change_speed(struct e100_serial *info)
 
         info->port[REG_TR_CTRL] = info->tx_ctrl;
         info->port[REG_REC_CTRL] = info->rx_ctrl;
-        xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(info->tty));
+        xoff = IO_FIELD(R_SERIAL0_XOFF, xoff_char, STOP_CHAR(info->port.tty));
         xoff |= IO_STATE(R_SERIAL0_XOFF, tx_stop, enable);
-        if (info->tty->termios->c_iflag & IXON ) {
-                DFLOW(DEBUG_LOG(info->line, "FLOW XOFF enabled 0x%02X\n", STOP_CHAR(info->tty)));
+        if (info->port.tty->termios->c_iflag & IXON ) {
+                DFLOW(DEBUG_LOG(info->line, "FLOW XOFF enabled 0x%02X\n",
+                                STOP_CHAR(info->port.tty)));
                 xoff |= IO_STATE(R_SERIAL0_XOFF, auto_xoff, enable);
         }
 
@@ -3475,7 +3478,7 @@ set_serial_info(struct e100_serial *info,
         info->type = new_serial.type;
         info->close_delay = new_serial.close_delay;
         info->closing_wait = new_serial.closing_wait;
-        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        info->port.tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
  check_and_exit:
         if (info->flags & ASYNC_INITIALIZED) {
@@ -3811,7 +3814,7 @@ rs_close(struct tty_struct *tty, struct file * filp)
         tty_ldisc_flush(tty);
         tty->closing = 0;
         info->event = 0;
-        info->tty = 0;
+        info->port.tty = NULL;
         if (info->blocked_open) {
                 if (info->close_delay)
                         schedule_timeout_interruptible(info->close_delay);
@@ -3915,7 +3918,7 @@ rs_hangup(struct tty_struct *tty)
         info->event = 0;
         info->count = 0;
         info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = 0;
+        info->port.tty = NULL;
         wake_up_interruptible(&info->open_wait);
 }
 
@@ -4077,9 +4080,9 @@ rs_open(struct tty_struct *tty, struct file * filp)
 
         info->count++;
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
 
-        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        info->port.tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         if (!tmp_buf) {
                 page = get_zeroed_page(GFP_KERNEL);
@@ -4267,14 +4270,14 @@ static int line_info(char *buf, struct e100_serial *info)
                        (unsigned long)info->max_recv_cnt);
 
 #if 1
-        if (info->tty) {
+        if (info->port.tty) {
 
-                if (info->tty->stopped)
+                if (info->port.tty->stopped)
                         ret += sprintf(buf+ret, " stopped:%i",
-                                       (int)info->tty->stopped);
-                if (info->tty->hw_stopped)
+                                       (int)info->port.tty->stopped);
+                if (info->port.tty->hw_stopped)
                         ret += sprintf(buf+ret, " hw_stopped:%i",
-                                       (int)info->tty->hw_stopped);
+                                       (int)info->port.tty->hw_stopped);
         }
 
         {
@@ -4465,7 +4468,7 @@ rs_init(void)
                 info->uses_dma_in = 0;
                 info->uses_dma_out = 0;
                 info->line = i;
-                info->tty = 0;
+                info->port.tty = NULL;
                 info->type = PORT_ETRAX;
                 info->tr_running = 0;
                 info->forced_eop = 0;
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index 0dddd68b20d2..a81d2c2ff8a2 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -197,7 +197,7 @@ static inline void dz_receive_chars(struct dz_mux *mux)
         while ((status = dz_in(dport, DZ_RBUF)) & DZ_DVAL) {
                 dport = &mux->dport[LINE(status)];
                 uport = &dport->port;
-                tty = uport->info->tty;         /* point to the proper dev */
+                tty = uport->info->port.tty;    /* point to the proper dev */
 
                 ch = UCHAR(status);             /* grab the char */
                 flag = TTY_NORMAL;
@@ -249,7 +249,7 @@ static inline void dz_receive_chars(struct dz_mux *mux)
         }
         for (i = 0; i < DZ_NB_PORT; i++)
                 if (lines_rx[i])
-                        tty_flip_buffer_push(mux->dport[i].port.info->tty);
+                        tty_flip_buffer_push(mux->dport[i].port.info->port.tty);
 }
 
 /*
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 64acb39a51ba..e0da4dc7bbf6 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -372,7 +372,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
 {
         struct imx_port *sport = dev_id;
         unsigned int rx,flg,ignored = 0;
-        struct tty_struct *tty = sport->port.info->tty;
+        struct tty_struct *tty = sport->port.info->port.tty;
         unsigned long flags, temp;
 
         spin_lock_irqsave(&sport->port.lock,flags);
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index 4f1af71e9a1b..6dd98f9fb89c 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -905,7 +905,7 @@ static void transmit_chars(struct uart_port *the_port)
                 return;
 
         info = the_port->info;
-        tty = info->tty;
+        tty = info->port.tty;
 
         if (uart_circ_empty(&info->xmit) || uart_tx_stopped(the_port)) {
                 /* Nothing to do or hw stopped */
@@ -997,14 +997,14 @@ ioc3_change_speed(struct uart_port *the_port,
 
         the_port->ignore_status_mask = N_ALL_INPUT;
 
-        info->tty->low_latency = 1;
+        info->port.tty->low_latency = 1;
 
-        if (I_IGNPAR(info->tty))
+        if (I_IGNPAR(info->port.tty))
                 the_port->ignore_status_mask &= ~(N_PARITY_ERROR
                                                   | N_FRAMING_ERROR);
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(info->port.tty)) {
                 the_port->ignore_status_mask &= ~N_BREAK;
-                if (I_IGNPAR(info->tty))
+                if (I_IGNPAR(info->port.tty))
                         the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
         }
         if (!(cflag & CREAD)) {
@@ -1399,14 +1399,14 @@ static int receive_chars(struct uart_port *the_port)
         /* Make sure all the pointers are "good" ones */
         if (!info)
                 return 0;
-        if (!info->tty)
+        if (!info->port.tty)
                 return 0;
 
         if (!(port->ip_flags & INPUT_ENABLE))
                 return 0;
 
         spin_lock_irqsave(&the_port->lock, pflags);
-        tty = info->tty;
+        tty = info->port.tty;
 
         read_count = do_read(the_port, ch, MAX_CHARS);
         if (read_count > 0) {
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 49b8a82b7b9f..6bab63cd5b29 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -1635,7 +1635,7 @@ static void transmit_chars(struct uart_port *the_port)
                 return;
 
         info = the_port->info;
-        tty = info->tty;
+        tty = info->port.tty;
 
         if (uart_circ_empty(&info->xmit) || uart_tx_stopped(the_port)) {
                 /* Nothing to do or hw stopped */
@@ -1738,14 +1738,14 @@ ioc4_change_speed(struct uart_port *the_port,
 
         the_port->ignore_status_mask = N_ALL_INPUT;
 
-        info->tty->low_latency = 1;
+        info->port.tty->low_latency = 1;
 
-        if (I_IGNPAR(info->tty))
+        if (I_IGNPAR(info->port.tty))
                 the_port->ignore_status_mask &= ~(N_PARITY_ERROR
                                                 | N_FRAMING_ERROR);
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(info->port.tty)) {
                 the_port->ignore_status_mask &= ~N_BREAK;
-                if (I_IGNPAR(info->tty))
+                if (I_IGNPAR(info->port.tty))
                         the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
         }
         if (!(cflag & CREAD)) {
@@ -1801,7 +1801,8 @@ static inline int ic4_startup_local(struct uart_port *the_port)
         ioc4_set_proto(port, the_port->mapbase);
 
         /* set the speed of the serial port */
-        ioc4_change_speed(the_port, info->tty->termios, (struct ktermios *)0);
+        ioc4_change_speed(the_port, info->port.tty->termios,
+                          (struct ktermios *)0);
 
         return 0;
 }
@@ -2346,11 +2347,11 @@ static void receive_chars(struct uart_port *the_port)
         /* Make sure all the pointers are "good" ones */
         if (!info)
                 return;
-        if (!info->tty)
+        if (!info->port.tty)
                 return;
 
         spin_lock_irqsave(&the_port->lock, pflags);
-        tty = info->tty;
+        tty = info->port.tty;
 
         request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS);
 
@@ -2440,8 +2441,8 @@ static void ic4_shutdown(struct uart_port *the_port)
 
         wake_up_interruptible(&info->delta_msr_wait);
 
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
         spin_lock_irqsave(&the_port->lock, port_flags);
         set_notification(port, N_ALL, 0);
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index 9c95bc0398ad..0d9acbd0bb70 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -257,8 +257,8 @@ static struct tty_struct *ip22zilog_receive_chars(struct uart_ip22zilog_port *up
 
         tty = NULL;
         if (up->port.info != NULL &&
-            up->port.info->tty != NULL)
-                tty = up->port.info->tty;
+            up->port.info->port.tty != NULL)
+                tty = up->port.info->port.tty;
 
         for (;;) {
                 ch = readb(&channel->control);
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index b2d6f5b1a7c2..b7584ca55ade 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -998,7 +998,7 @@ static void neo_param(struct jsm_channel *ch)
                         {     50, B50     },
                 };
 
-                cflag = C_BAUD(ch->uart_port.info->tty);
+                cflag = C_BAUD(ch->uart_port.info->port.tty);
                 baud = 9600;
                 for (i = 0; i < ARRAY_SIZE(baud_rates); i++) {
                         if (baud_rates[i].cflag == cflag) {
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 94ec66372508..a697914ae3d0 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -145,7 +145,7 @@ static void jsm_tty_send_xchar(struct uart_port *port, char ch)
         struct ktermios *termios;
 
         spin_lock_irqsave(&port->lock, lock_flags);
-        termios = port->info->tty->termios;
+        termios = port->info->port.tty->termios;
         if (ch == termios->c_cc[VSTART])
                 channel->ch_bd->bd_ops->send_start_character(channel);
 
@@ -239,7 +239,7 @@ static int jsm_tty_open(struct uart_port *port)
         channel->ch_cached_lsr = 0;
         channel->ch_stops_sent = 0;
 
-        termios = port->info->tty->termios;
+        termios = port->info->port.tty->termios;
         channel->ch_c_cflag     = termios->c_cflag;
         channel->ch_c_iflag     = termios->c_iflag;
         channel->ch_c_oflag     = termios->c_oflag;
@@ -272,7 +272,7 @@ static void jsm_tty_close(struct uart_port *port)
         jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n");
 
         bd = channel->ch_bd;
-        ts = channel->uart_port.info->tty->termios;
+        ts = channel->uart_port.info->port.tty->termios;
 
         channel->ch_flags &= ~(CH_STOPI);
 
@@ -515,7 +515,7 @@ void jsm_input(struct jsm_channel *ch)
         if (!ch)
                 return;
 
-        tp = ch->uart_port.info->tty;
+        tp = ch->uart_port.info->port.tty;
 
         bd = ch->ch_bd;
         if(!bd)
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index c2bb11c02bde..23d030511019 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -325,7 +325,7 @@ static void m32r_sio_enable_ms(struct uart_port *port)
 
 static void receive_chars(struct uart_sio_port *up, int *status)
 {
-        struct tty_struct *tty = up->port.info->tty;
+        struct tty_struct *tty = up->port.info->port.tty;
         unsigned char ch;
         unsigned char flag;
         int max_count = 256;
@@ -1160,7 +1160,7 @@ static int __init m32r_sio_init(void)
 {
         int ret, i;
 
-        printk(KERN_INFO "Serial: M32R SIO driver $Revision: 1.11 $ ");
+        printk(KERN_INFO "Serial: M32R SIO driver\n");
 
         for (i = 0; i < NR_IRQS; i++)
                 spin_lock_init(&irq_lists[i].lock);
@@ -1189,4 +1189,4 @@ EXPORT_SYMBOL(m32r_sio_suspend_port);
 EXPORT_SYMBOL(m32r_sio_resume_port);
 
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Generic M32R SIO serial driver $Revision: 1.11 $");
+MODULE_DESCRIPTION("Generic M32R SIO serial driver");
diff --git a/drivers/serial/mcf.c b/drivers/serial/mcf.c
index 7e164e0cd211..b2001c5b145c 100644
--- a/drivers/serial/mcf.c
+++ b/drivers/serial/mcf.c
@@ -312,7 +312,7 @@ static void mcf_rx_chars(struct mcf_uart *pp)
                 uart_insert_char(port, status, MCFUART_USR_RXOVERRUN, ch, flag);
         }
 
-        tty_flip_buffer_push(port->info->tty);
+        tty_flip_buffer_push(port->info->port.tty);
 }
 
 /****************************************************************************/
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 56007cc8a9b3..fbe3835f6b77 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -327,7 +327,7 @@ static void mcfrs_start(struct tty_struct *tty)
 static inline void receive_chars(struct mcf_serial *info)
 {
         volatile unsigned char  *uartp;
-        struct tty_struct       *tty = info->tty;
+        struct tty_struct       *tty = info->port.tty;
         unsigned char           status, ch, flag;
 
         if (!tty)
@@ -382,7 +382,7 @@ static inline void transmit_chars(struct mcf_serial *info)
                 info->stats.tx++;
         }
 
-        if ((info->xmit_cnt <= 0) || info->tty->stopped) {
+        if ((info->xmit_cnt <= 0) || info->port.tty->stopped) {
                 info->imr &= ~MCFUART_UIR_TXREADY;
                 uartp[MCFUART_UIMR] = info->imr;
                 return;
@@ -428,7 +428,7 @@ irqreturn_t mcfrs_interrupt(int irq, void *dev_id)
 static void mcfrs_offintr(struct work_struct *work)
 {
         struct mcf_serial *info = container_of(work, struct mcf_serial, tqueue);
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         
         if (tty)
                 tty_wakeup(tty);
@@ -498,7 +498,7 @@ static void mcfrs_timer(void)
 static void do_serial_hangup(struct work_struct *work)
 {
         struct mcf_serial *info = container_of(work, struct mcf_serial, tqueue_hangup);
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
         
         if (tty)
                 tty_hangup(tty);
@@ -532,8 +532,8 @@ static int startup(struct mcf_serial * info)
         uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */
         mcfrs_setsignals(info, 1, 1);
 
-        if (info->tty)
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
 
         /*
@@ -578,7 +578,7 @@ static void shutdown(struct mcf_serial * info)
         uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETRX;  /* reset RX */
         uartp[MCFUART_UCR] = MCFUART_UCR_CMDRESETTX;  /* reset TX */
 
-        if (!info->tty || (info->tty->termios->c_cflag & HUPCL))
+        if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL))
                 mcfrs_setsignals(info, 0, 0);
 
         if (info->xmit_buf) {
@@ -586,8 +586,8 @@ static void shutdown(struct mcf_serial * info)
                 info->xmit_buf = 0;
         }
 
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
         
         info->flags &= ~ASYNC_INITIALIZED;
         local_irq_restore(flags);
@@ -609,9 +609,9 @@ static void mcfrs_change_speed(struct mcf_serial *info)
         unsigned int            fraction;
 #endif
 
-        if (!info->tty || !info->tty->termios)
+        if (!info->port.tty || !info->port.tty->termios)
                 return;
-        cflag = info->tty->termios->c_cflag;
+        cflag = info->port.tty->termios->c_cflag;
         if (info->addr == 0)
                 return;
 
@@ -623,7 +623,7 @@ static void mcfrs_change_speed(struct mcf_serial *info)
         if (i & CBAUDEX) {
                 i &= ~CBAUDEX;
                 if (i < 1 || i > 4)
-                        info->tty->termios->c_cflag &= ~CBAUDEX;
+                        info->port.tty->termios->c_cflag &= ~CBAUDEX;
                 else
                         i += 15;
         }
@@ -1216,7 +1216,7 @@ static void mcfrs_close(struct tty_struct *tty, struct file * filp)
         
         tty->closing = 0;
         info->event = 0;
-        info->tty = 0;
+        info->port.tty = NULL;
 #if 0   
         if (tty->ldisc.num != ldiscs[N_TTY].num) {
                 if (tty->ldisc.close)
@@ -1325,7 +1325,7 @@ void mcfrs_hangup(struct tty_struct *tty)
         info->event = 0;
         info->count = 0;
         info->flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->tty = 0;
+        info->port.tty = NULL;
         wake_up_interruptible(&info->open_wait);
 }
 
@@ -1452,7 +1452,7 @@ int mcfrs_open(struct tty_struct *tty, struct file * filp)
 #endif
         info->count++;
         tty->driver_data = info;
-        info->tty = tty;
+        info->port.tty = tty;
 
         /*
          * Start up serial port
@@ -1767,7 +1767,7 @@ mcfrs_init(void)
         for (i = 0, info = mcfrs_table; (i < NR_PORTS); i++, info++) {
                 info->magic = SERIAL_MAGIC;
                 info->line = i;
-                info->tty = 0;
+                info->port.tty = NULL;
                 info->custom_divisor = 16;
                 info->close_delay = 50;
                 info->closing_wait = 3000;
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index efc971d9647b..36126070d9af 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -732,7 +732,7 @@ static struct uart_ops mpc52xx_uart_ops = {
 static inline int
 mpc52xx_uart_int_rx_chars(struct uart_port *port)
 {
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         unsigned char ch, flag;
         unsigned short status;
 
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index e8819c43f57d..c9f53e71f252 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -932,7 +932,7 @@ static int mpsc_make_ready(struct mpsc_port_info *pi)
 static int mpsc_rx_intr(struct mpsc_port_info *pi)
 {
         struct mpsc_rx_desc *rxre;
-        struct tty_struct *tty = pi->port.info->tty;
+        struct tty_struct *tty = pi->port.info->port.tty;
         u32     cmdstat, bytes_in, i;
         int     rc = 0;
         u8      *bp;
@@ -1972,7 +1972,7 @@ static int __init mpsc_drv_init(void)
 {
         int     rc;
 
-        printk(KERN_INFO "Serial: MPSC driver $Revision: 1.00 $\n");
+        printk(KERN_INFO "Serial: MPSC driver\n");
 
         memset(mpsc_ports, 0, sizeof(mpsc_ports));
         memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
@@ -2004,7 +2004,7 @@ module_init(mpsc_drv_init);
 module_exit(mpsc_drv_exit);
 
 MODULE_AUTHOR("Mark A. Greer <mgreer@mvista.com>");
-MODULE_DESCRIPTION("Generic Marvell MPSC serial/UART driver $Revision: 1.00 $");
+MODULE_DESCRIPTION("Generic Marvell MPSC serial/UART driver");
 MODULE_VERSION(MPSC_VERSION);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CHARDEV_MAJOR(MPSC_MAJOR);
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index e94031731a47..953a5ffa9b44 100644
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -243,7 +243,7 @@ static void mux_write(struct uart_port *port)
 static void mux_read(struct uart_port *port)
 {
         int data;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         __u32 start_count = port->icount.rx;
 
         while(1) {
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c
index 81ac9bb4f39b..9f8ccb735c19 100644
--- a/drivers/serial/netx-serial.c
+++ b/drivers/serial/netx-serial.c
@@ -203,7 +203,7 @@ static void netx_txint(struct uart_port *port)
 static void netx_rxint(struct uart_port *port)
 {
         unsigned char rx, flg, status;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
 
         while (!(readl(port->membase + UART_FR) & FR_RXFE)) {
                 rx = readl(port->membase + UART_DR);
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 794bd0f50d73..317b061f7641 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -242,12 +242,12 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
         }
 
         /* Sanity check, make sure the old bug is no longer happening */
-        if (uap->port.info == NULL || uap->port.info->tty == NULL) {
+        if (uap->port.info == NULL || uap->port.info->port.tty == NULL) {
                 WARN_ON(1);
                 (void)read_zsdata(uap);
                 return NULL;
         }
-        tty = uap->port.info->tty;
+        tty = uap->port.info->port.tty;
 
         while (1) {
                 error = 0;
diff --git a/drivers/serial/pnx8xxx_uart.c b/drivers/serial/pnx8xxx_uart.c
index d0e5a79ea635..22e30d21225e 100644
--- a/drivers/serial/pnx8xxx_uart.c
+++ b/drivers/serial/pnx8xxx_uart.c
@@ -181,7 +181,7 @@ static void pnx8xxx_enable_ms(struct uart_port *port)
 
 static void pnx8xxx_rx_chars(struct pnx8xxx_port *sport)
 {
-        struct tty_struct *tty = sport->port.info->tty;
+        struct tty_struct *tty = sport->port.info->port.tty;
         unsigned int status, ch, flg;
 
         status = FIFO_TO_SM(serial_in(sport, PNX8XXX_FIFO)) |
@@ -824,7 +824,7 @@ static int __init pnx8xxx_serial_init(void)
 {
         int ret;
 
-        printk(KERN_INFO "Serial: PNX8XXX driver $Revision: 1.2 $\n");
+        printk(KERN_INFO "Serial: PNX8XXX driver\n");
 
         pnx8xxx_init_ports();
 
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index b4f7ffb7688d..b9a93f326fb8 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -101,7 +101,7 @@ static void serial_pxa_stop_rx(struct uart_port *port)
 
 static inline void receive_chars(struct uart_pxa_port *up, int *status)
 {
-        struct tty_struct *tty = up->port.info->tty;
+        struct tty_struct *tty = up->port.info->port.tty;
         unsigned int ch, flag;
         int max_count = 256;
 
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 62b38582f5e9..a5e76cc18073 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -20,9 +20,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $
- *
  */
 
 #if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
@@ -192,7 +189,7 @@ static void sa1100_enable_ms(struct uart_port *port)
 static void
 sa1100_rx_chars(struct sa1100_port *sport)
 {
-        struct tty_struct *tty = sport->port.info->tty;
+        struct tty_struct *tty = sport->port.info->port.tty;
         unsigned int status, ch, flg;
 
         status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |
@@ -892,7 +889,7 @@ static int __init sa1100_serial_init(void)
 {
         int ret;
 
-        printk(KERN_INFO "Serial: SA11x0 driver $Revision: 1.50 $\n");
+        printk(KERN_INFO "Serial: SA11x0 driver\n");
 
         sa1100_init_ports();
 
@@ -915,7 +912,7 @@ module_init(sa1100_serial_init);
 module_exit(sa1100_serial_exit);
 
 MODULE_AUTHOR("Deep Blue Solutions Ltd");
-MODULE_DESCRIPTION("SA1100 generic serial port driver $Revision: 1.50 $");
+MODULE_DESCRIPTION("SA1100 generic serial port driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_SA1100_MAJOR);
 MODULE_ALIAS("platform:sa11x0-uart");
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c
index f8e1447a022a..a4fb343a08da 100644
--- a/drivers/serial/sb1250-duart.c
+++ b/drivers/serial/sb1250-duart.c
@@ -384,7 +384,7 @@ static void sbd_receive_chars(struct sbd_port *sport)
                 uart_insert_char(uport, status, M_DUART_OVRUN_ERR, ch, flag);
         }
 
-        tty_flip_buffer_push(uport->info->tty);
+        tty_flip_buffer_push(uport->info->port.tty);
 }
 
 static void sbd_transmit_chars(struct sbd_port *sport)
diff --git a/drivers/serial/sc26xx.c b/drivers/serial/sc26xx.c
index ae2a9e2df777..e0be11ceaa25 100644
--- a/drivers/serial/sc26xx.c
+++ b/drivers/serial/sc26xx.c
@@ -141,7 +141,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
         u8 status;
 
         if (port->info != NULL)         /* Unopened serial console */
-                tty = port->info->tty;
+                tty = port->info->port.tty;
 
         while (limit-- > 0) {
                 status = READ_SC_PORT(port, SR);
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 42d2e108b679..0bce1fe2c62a 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -50,7 +50,7 @@ static struct lock_class_key port_lock_key;
 
 #define HIGH_BITS_OFFSET        ((sizeof(long)-sizeof(int))*8)
 
-#define uart_users(state)       ((state)->count + ((state)->info ? (state)->info->blocked_open : 0))
+#define uart_users(state)       ((state)->count + ((state)->info ? (state)->info->port.blocked_open : 0))
 
 #ifdef CONFIG_SERIAL_CORE_CONSOLE
 #define uart_console(port)      ((port)->cons && (port)->cons->index == (port)->line)
@@ -113,7 +113,7 @@ static void uart_start(struct tty_struct *tty)
 static void uart_tasklet_action(unsigned long data)
 {
         struct uart_state *state = (struct uart_state *)data;
-        tty_wakeup(state->info->tty);
+        tty_wakeup(state->info->port.tty);
 }
 
 static inline void
@@ -135,7 +135,7 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)
 
 /*
  * Startup the port.  This will be called once per open.  All calls
- * will be serialised by the per-port semaphore.
+ * will be serialised by the per-port mutex.
  */
 static int uart_startup(struct uart_state *state, int init_hw)
 {
@@ -152,7 +152,7 @@ static int uart_startup(struct uart_state *state, int init_hw)
          * once we have successfully opened the port.  Also set
          * up the tty->alt_speed kludge
          */
-        set_bit(TTY_IO_ERROR, &info->tty->flags);
+        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
         if (port->type == PORT_UNKNOWN)
                 return 0;
@@ -162,6 +162,7 @@ static int uart_startup(struct uart_state *state, int init_hw)
          * buffer.
          */
         if (!info->xmit.buf) {
+                /* This is protected by the per port mutex */
                 page = get_zeroed_page(GFP_KERNEL);
                 if (!page)
                         return -ENOMEM;
@@ -182,20 +183,20 @@ static int uart_startup(struct uart_state *state, int init_hw)
                          * Setup the RTS and DTR signals once the
                          * port is open and ready to respond.
                          */
-                        if (info->tty->termios->c_cflag & CBAUD)
+                        if (info->port.tty->termios->c_cflag & CBAUD)
                                 uart_set_mctrl(port, TIOCM_RTS | TIOCM_DTR);
                 }
 
                 if (info->flags & UIF_CTS_FLOW) {
                         spin_lock_irq(&port->lock);
                         if (!(port->ops->get_mctrl(port) & TIOCM_CTS))
-                                info->tty->hw_stopped = 1;
+                                info->port.tty->hw_stopped = 1;
                         spin_unlock_irq(&port->lock);
                 }
 
                 info->flags |= UIF_INITIALIZED;
 
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
+                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
         }
 
         if (retval && capable(CAP_SYS_ADMIN))
@@ -217,8 +218,8 @@ static void uart_shutdown(struct uart_state *state)
         /*
          * Set the TTY IO error marker
          */
-        if (info->tty)
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
+        if (info->port.tty)
+                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
         if (info->flags & UIF_INITIALIZED) {
                 info->flags &= ~UIF_INITIALIZED;
@@ -226,7 +227,7 @@ static void uart_shutdown(struct uart_state *state)
                 /*
                  * Turn off DTR and RTS early.
                  */
-                if (!info->tty || (info->tty->termios->c_cflag & HUPCL))
+                if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL))
                         uart_clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
 
                 /*
@@ -426,7 +427,7 @@ EXPORT_SYMBOL(uart_get_divisor);
 static void
 uart_change_speed(struct uart_state *state, struct ktermios *old_termios)
 {
-        struct tty_struct *tty = state->info->tty;
+        struct tty_struct *tty = state->info->port.tty;
         struct uart_port *port = state->port;
         struct ktermios *termios;
 
@@ -573,6 +574,8 @@ static void uart_flush_buffer(struct tty_struct *tty)
 
         spin_lock_irqsave(&port->lock, flags);
         uart_circ_clear(&state->info->xmit);
+        if (port->ops->flush_buffer)
+                port->ops->flush_buffer(port);
         spin_unlock_irqrestore(&port->lock, flags);
         tty_wakeup(tty);
 }
@@ -834,8 +837,8 @@ static int uart_set_info(struct uart_state *state,
         state->closing_wait    = closing_wait;
         if (new_serial.xmit_fifo_size)
                 port->fifosize = new_serial.xmit_fifo_size;
-        if (state->info->tty)
-                state->info->tty->low_latency =
+        if (state->info->port.tty)
+                state->info->port.tty->low_latency =
                         (port->flags & UPF_LOW_LATENCY) ? 1 : 0;
 
  check_and_exit:
@@ -855,7 +858,7 @@ static int uart_set_info(struct uart_state *state,
                                 printk(KERN_NOTICE
                                        "%s sets custom speed on %s. This "
                                        "is deprecated.\n", current->comm,
-                                       tty_name(state->info->tty, buf));
+                                       tty_name(state->info->port.tty, buf));
                         }
                         uart_change_speed(state, NULL);
                 }
@@ -887,7 +890,7 @@ static int uart_get_lsr_info(struct uart_state *state,
          */
         if (port->x_char ||
             ((uart_circ_chars_pending(&state->info->xmit) > 0) &&
-             !state->info->tty->stopped && !state->info->tty->hw_stopped))
+             !state->info->port.tty->stopped && !state->info->port.tty->hw_stopped))
                 result &= ~TIOCSER_TEMT;
 
         return put_user(result, value);
@@ -1237,7 +1240,7 @@ static void uart_set_termios(struct tty_struct *tty,
          */
         if (!(old_termios->c_cflag & CLOCAL) &&
             (tty->termios->c_cflag & CLOCAL))
-                wake_up_interruptible(&state->info->open_wait);
+                wake_up_interruptible(&state->info->port.open_wait);
 #endif
 }
 
@@ -1318,9 +1321,9 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
         tty_ldisc_flush(tty);
 
         tty->closing = 0;
-        state->info->tty = NULL;
+        state->info->port.tty = NULL;
 
-        if (state->info->blocked_open) {
+        if (state->info->port.blocked_open) {
                 if (state->close_delay)
                         msleep_interruptible(state->close_delay);
         } else if (!uart_console(port)) {
@@ -1331,7 +1334,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
          * Wake up anyone trying to open this port.
          */
         state->info->flags &= ~UIF_NORMAL_ACTIVE;
-        wake_up_interruptible(&state->info->open_wait);
+        wake_up_interruptible(&state->info->port.open_wait);
 
  done:
         mutex_unlock(&state->mutex);
@@ -1415,8 +1418,8 @@ static void uart_hangup(struct tty_struct *tty)
                 uart_shutdown(state);
                 state->count = 0;
                 state->info->flags &= ~UIF_NORMAL_ACTIVE;
-                state->info->tty = NULL;
-                wake_up_interruptible(&state->info->open_wait);
+                state->info->port.tty = NULL;
+                wake_up_interruptible(&state->info->port.open_wait);
                 wake_up_interruptible(&state->info->delta_msr_wait);
         }
         mutex_unlock(&state->mutex);
@@ -1430,7 +1433,7 @@ static void uart_hangup(struct tty_struct *tty)
  */
 static void uart_update_termios(struct uart_state *state)
 {
-        struct tty_struct *tty = state->info->tty;
+        struct tty_struct *tty = state->info->port.tty;
         struct uart_port *port = state->port;
 
         if (uart_console(port) && port->cons->cflag) {
@@ -1469,17 +1472,17 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
         struct uart_port *port = state->port;
         unsigned int mctrl;
 
-        info->blocked_open++;
+        info->port.blocked_open++;
         state->count--;
 
-        add_wait_queue(&info->open_wait, &wait);
+        add_wait_queue(&info->port.open_wait, &wait);
         while (1) {
                 set_current_state(TASK_INTERRUPTIBLE);
 
                 /*
                  * If we have been hung up, tell userspace/restart open.
                  */
-                if (tty_hung_up_p(filp) || info->tty == NULL)
+                if (tty_hung_up_p(filp) || info->port.tty == NULL)
                         break;
 
                 /*
@@ -1498,8 +1501,8 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
                  * have set TTY_IO_ERROR for a non-existant port.
                  */
                 if ((filp->f_flags & O_NONBLOCK) ||
-                    (info->tty->termios->c_cflag & CLOCAL) ||
-                    (info->tty->flags & (1 << TTY_IO_ERROR)))
+                    (info->port.tty->termios->c_cflag & CLOCAL) ||
+                    (info->port.tty->flags & (1 << TTY_IO_ERROR)))
                         break;
 
                 /*
@@ -1507,7 +1510,7 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
                  * not set RTS here - we want to make sure we catch
                  * the data from the modem.
                  */
-                if (info->tty->termios->c_cflag & CBAUD)
+                if (info->port.tty->termios->c_cflag & CBAUD)
                         uart_set_mctrl(port, TIOCM_DTR);
 
                 /*
@@ -1529,15 +1532,15 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
                         break;
         }
         set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
+        remove_wait_queue(&info->port.open_wait, &wait);
 
         state->count++;
-        info->blocked_open--;
+        info->port.blocked_open--;
 
         if (signal_pending(current))
                 return -ERESTARTSYS;
 
-        if (!info->tty || tty_hung_up_p(filp))
+        if (!info->port.tty || tty_hung_up_p(filp))
                 return -EAGAIN;
 
         return 0;
@@ -1560,10 +1563,13 @@ static struct uart_state *uart_get(struct uart_driver *drv, int line)
                 goto err_unlock;
         }
 
+        /* BKL: RACE HERE - LEAK */
+        /* We should move this into the uart_state structure and kill off
+           this whole complexity */
         if (!state->info) {
                 state->info = kzalloc(sizeof(struct uart_info), GFP_KERNEL);
                 if (state->info) {
-                        init_waitqueue_head(&state->info->open_wait);
+                        init_waitqueue_head(&state->info->port.open_wait);
                         init_waitqueue_head(&state->info->delta_msr_wait);
 
                         /*
@@ -1620,7 +1626,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
          * be re-entered while allocating the info structure, or while we
          * request any IRQs that the driver may need.  This also has the nice
          * side-effect that it delays the action of uart_hangup, so we can
-         * guarantee that info->tty will always contain something reasonable.
+         * guarantee that info->port.tty will always contain something reasonable.
          */
         state = uart_get(drv, line);
         if (IS_ERR(state)) {
@@ -1636,7 +1642,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         tty->driver_data = state;
         tty->low_latency = (state->port->flags & UPF_LOW_LATENCY) ? 1 : 0;
         tty->alt_speed = 0;
-        state->info->tty = tty;
+        state->info->port.tty = tty;
 
         /*
          * If the port is in the middle of closing, bail out now.
@@ -2099,8 +2105,8 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
                 /*
                  * If that's unset, use the tty termios setting.
                  */
-                if (state->info && state->info->tty && termios.c_cflag == 0)
-                        termios = *state->info->tty->termios;
+                if (state->info && state->info->port.tty && termios.c_cflag == 0)
+                        termios = *state->info->port.tty->termios;
 
                 uart_change_pm(state, 0);
                 port->ops->set_termios(port, &termios, NULL);
@@ -2519,8 +2525,8 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
         tty_unregister_device(drv->tty_driver, port->line);
 
         info = state->info;
-        if (info && info->tty)
-                tty_vhangup(info->tty);
+        if (info && info->port.tty)
+                tty_vhangup(info->port.tty);
 
         /*
          * All users of this port should now be disconnected from
diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c
index 8721afe1ae4f..0edbc5dd378b 100644
--- a/drivers/serial/serial_ks8695.c
+++ b/drivers/serial/serial_ks8695.c
@@ -108,7 +108,7 @@ static void ks8695uart_disable_ms(struct uart_port *port)
 static irqreturn_t ks8695uart_rx_chars(int irq, void *dev_id)
 {
         struct uart_port *port = dev_id;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         unsigned int status, ch, lsr, flg, max_count = 256;
 
         status = UART_GET_LSR(port);            /* clears pending LSR interrupts */
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
index eb18d429752d..cb49a5ac022f 100644
--- a/drivers/serial/serial_lh7a40x.c
+++ b/drivers/serial/serial_lh7a40x.c
@@ -137,7 +137,7 @@ static void lh7a40xuart_enable_ms (struct uart_port* port)
 
 static void lh7a40xuart_rx_chars (struct uart_port* port)
 {
-        struct tty_struct* tty = port->info->tty;
+        struct tty_struct* tty = port->info->port.tty;
         int cbRxMax = 256;      /* (Gross) limit on receive */
         unsigned int data;      /* Received data and status */
         unsigned int flag;
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index ce6ee92b3a1b..208e42ba9455 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -521,7 +521,7 @@ static void sci_transmit_chars(struct uart_port *port)
 static inline void sci_receive_chars(struct uart_port *port)
 {
         struct sci_port *sci_port = (struct sci_port *)port;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         int i, count, copied = 0;
         unsigned short status;
         unsigned char flag;
@@ -642,7 +642,7 @@ static inline int sci_handle_errors(struct uart_port *port)
 {
         int copied = 0;
         unsigned short status = sci_in(port, SCxSR);
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
 
         if (status & SCxSR_ORER(port)) {
                 /* overrun error */
@@ -692,7 +692,7 @@ static inline int sci_handle_breaks(struct uart_port *port)
 {
         int copied = 0;
         unsigned short status = sci_in(port, SCxSR);
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         struct sci_port *s = &sci_ports[port->line];
 
         if (uart_handle_break(port))
@@ -762,7 +762,7 @@ static irqreturn_t sci_er_interrupt(int irq, void *ptr)
         } else {
 #if defined(SCIF_ORER)
                 if((sci_in(port, SCLSR) & SCIF_ORER) != 0) {
-                        struct tty_struct *tty = port->info->tty;
+                        struct tty_struct *tty = port->info->port.tty;
 
                         sci_out(port, SCLSR, 0);
                         tty_insert_flip_char(tty, 0, TTY_OVERRUN);
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 019da2e05f0b..b73e3c0056cd 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -471,7 +471,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
 
         if (port->sc_port.info) {
                 /* The serial_core stuffs are initilized, use them */
-                tty = port->sc_port.info->tty;
+                tty = port->sc_port.info->port.tty;
         }
         else {
                 /* Not registered yet - can't pass to tty layer.  */
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 2847336742d7..aeeec5588afd 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -185,7 +185,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
         struct tty_struct *tty = NULL;
 
         if (port->info != NULL)         /* Unopened serial console */
-                tty = port->info->tty;
+                tty = port->info->port.tty;
 
         if (sunhv_ops->receive_chars(port, tty))
                 sun_do_break();
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 9ff5b38f3bee..15ee497e1c78 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -118,7 +118,7 @@ receive_chars(struct uart_sunsab_port *up,
         int i;
 
         if (up->port.info != NULL)              /* Unopened serial console */
-                tty = up->port.info->tty;
+                tty = up->port.info->port.tty;
 
         /* Read number of BYTES (Character + Status) available. */
         if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 03806a935209..e24e68235088 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1,4 +1,4 @@
-/* $Id: su.c,v 1.55 2002/01/08 16:00:16 davem Exp $
+/*
  * su.c: Small serial driver for keyboard/mouse interface on sparc32/PCI
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -311,7 +311,7 @@ static void sunsu_enable_ms(struct uart_port *port)
 static struct tty_struct *
 receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 {
-        struct tty_struct *tty = up->port.info->tty;
+        struct tty_struct *tty = up->port.info->port.tty;
         unsigned char ch, flag;
         int max_count = 256;
         int saw_console_brk = 0;
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 7e9fa5ef0eb7..0f3d69b86d67 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -329,8 +329,8 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
 
         tty = NULL;
         if (up->port.info != NULL &&            /* Unopened serial console */
-            up->port.info->tty != NULL)         /* Keyboard || mouse */
-                tty = up->port.info->tty;
+            up->port.info->port.tty != NULL)    /* Keyboard || mouse */
+                tty = up->port.info->port.tty;
 
         for (;;) {
 
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index b51c24245be4..6a3f8fb0c9dd 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -75,7 +75,7 @@ static struct uart_port ulite_ports[ULITE_NR_UARTS];
 
 static int ulite_receive(struct uart_port *port, int stat)
 {
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         unsigned char ch = 0;
         char flag = TTY_NORMAL;
 
@@ -162,7 +162,7 @@ static irqreturn_t ulite_isr(int irq, void *dev_id)
                 busy |= ulite_transmit(port, stat);
         } while (busy);
 
-        tty_flip_buffer_push(port->info->tty);
+        tty_flip_buffer_push(port->info->port.tty);
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index 566a8b42e05a..5c5d18dcb6ac 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -466,7 +466,7 @@ static void qe_uart_int_rx(struct uart_qe_port *qe_port)
         int i;
         unsigned char ch, *cp;
         struct uart_port *port = &qe_port->port;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         struct qe_bd *bdp;
         u16 status;
         unsigned int flg;
diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c
index dd98aca6ed08..5acf061b6cd2 100644
--- a/drivers/serial/v850e_uart.c
+++ b/drivers/serial/v850e_uart.c
@@ -300,8 +300,8 @@ static irqreturn_t v850e_uart_rx_irq(int irq, void *data)
 
         port->icount.rx++;
 
-        tty_insert_flip_char (port->info->tty, ch, ch_stat);
-        tty_schedule_flip (port->info->tty);
+        tty_insert_flip_char (port->info->port.tty, ch, ch_stat);
+        tty_schedule_flip (port->info->port.tty);
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index bb6ce6bba32f..0573f3b5175e 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -318,7 +318,7 @@ static inline void receive_chars(struct uart_port *port, uint8_t *status)
         char flag;
         int max_count = RX_MAX_COUNT;
 
-        tty = port->info->tty;
+        tty = port->info->port.tty;
         lsr = *status;
 
         do {
diff --git a/drivers/serial/zs.c b/drivers/serial/zs.c
index 65f1294fd27b..bd45b6230fd8 100644
--- a/drivers/serial/zs.c
+++ b/drivers/serial/zs.c
@@ -602,7 +602,7 @@ static void zs_receive_chars(struct zs_port *zport)
                 uart_insert_char(uport, status, Rx_OVR, ch, flag);
         }
 
-        tty_flip_buffer_push(uport->info->tty);
+        tty_flip_buffer_push(uport->info->port.tty);
 }
 
 static void zs_raw_transmit_chars(struct zs_port *zport)
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 05a328c11a8b..45c154ade9ca 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2383,6 +2383,9 @@ default_chipset:
                 goto amifb_error;
         }
 
+        fb_videomode_to_modelist(ami_modedb, NUM_TOTAL_MODES,
+                                 &fb_info.modelist);
+
         round_down_bpp = 0;
         chipptr = chipalloc(fb_info.fix.smem_len+
                             SPRITEMEMSIZE+
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index dff35474b854..fa55d356b535 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -3110,7 +3110,7 @@ int __init atafb_init(void)
         printk("atafb_init: start\n");
 
         if (!MACH_IS_ATARI)
-                return -ENXIO;
+                return -ENODEV;
 
         do {
 #ifdef ATAFB_EXT
@@ -3230,6 +3230,9 @@ int __init atafb_init(void)
                 return -EINVAL;
         }
 
+        fb_videomode_to_modelist(atafb_modedb, NUM_TOTAL_MODES,
+                                 &fb_info.modelist);
+
         atafb_set_disp(&fb_info);
 
         fb_alloc_cmap(&(fb_info.cmap), 1 << fb_info.var.bits_per_pixel, 0);
diff --git a/drivers/video/c2p.c b/drivers/video/c2p.c
index 5c30bbd33054..376bc07ff952 100644
--- a/drivers/video/c2p.c
+++ b/drivers/video/c2p.c
@@ -12,6 +12,7 @@
  *  for more details.
  */
 
+#include <linux/module.h>
 #include <linux/string.h>
 #include "c2p.h"
 
@@ -226,4 +227,6 @@ void c2p(u8 *dst, const u8 *src, u32 dx, u32 dy, u32 width, u32 height,
         dst += dst_nextline;
     }
 }
+EXPORT_SYMBOL_GPL(c2p);
 
+MODULE_LICENSE("GPL");
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index 099b6fb5b5cb..d47c47fc048f 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -1,6 +1,4 @@
 /*
- *      $Id: proc.c,v 1.1.2.1 1998/06/07 23:21:01 geert Exp $
- *
  *      Procfs interface for the Zorro bus.
  *
  *      Copyright (C) 1998-2003 Geert Uytterhoeven
@@ -160,4 +158,4 @@ static int __init zorro_proc_init(void)
         return 0;
 }
 
-__initcall(zorro_proc_init);
+device_initcall(zorro_proc_init);
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index 808b4f8675c5..3da712cc7708 100644
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -15,6 +15,7 @@
 #include <linux/zorro.h>
 #include <linux/stat.h>
 #include <linux/string.h>
+#include <linux/fs.h>
 
 #include "zorro.h"
 
@@ -56,12 +57,6 @@ static ssize_t zorro_read_config(struct kobject *kobj,
         struct zorro_dev *z = to_zorro_dev(container_of(kobj, struct device,
                                            kobj));
         struct ConfigDev cd;
-        unsigned int size = sizeof(cd);
-
-        if (off > size)
-                return 0;
-        if (off+count > size)
-                count = size-off;
 
         /* Construct a ConfigDev */
         memset(&cd, 0, sizeof(cd));
@@ -71,8 +66,7 @@ static ssize_t zorro_read_config(struct kobject *kobj,
         cd.cd_BoardAddr = (void *)zorro_resource_start(z);
         cd.cd_BoardSize = zorro_resource_len(z);
 
-        memcpy(buf, (void *)&cd+off, count);
-        return count;
+        return memory_read_from_buffer(buf, count, &off, &cd, sizeof(cd));
 }
 
 static struct bin_attribute zorro_config_attr = {
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 4cc42b64820c..dff16d9767d8 100644
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -1,6 +1,4 @@
 /*
- *    $Id: zorro.c,v 1.1.2.1 1998/06/07 23:21:02 geert Exp $
- *
  *    Zorro Bus Services
  *
  *    Copyright (C) 1995-2003 Geert Uytterhoeven
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids
index 560fef2a7b1c..0c0f99e2dd62 100644
--- a/drivers/zorro/zorro.ids
+++ b/drivers/zorro/zorro.ids
@@ -4,8 +4,6 @@
 #       Maintained by Geert Uytterhoeven <zorro@linux-m68k.org>
 #       If you have any new entries, please send them to the maintainer.
 #
-#       $Id: zorro.ids,v 1.19 2002/10/14 13:08:58 geert Exp $
-#
 
 # Manufacturers and Products. Please keep sorted.
 
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 0e64312a084c..179589be063a 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -1027,9 +1027,10 @@ EXPORT_SYMBOL(configfs_undepend_item);
 
 static int configfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
-        int ret, module_got = 0;
-        struct config_group *group;
-        struct config_item *item;
+        int ret = 0;
+        int module_got = 0;
+        struct config_group *group = NULL;
+        struct config_item *item = NULL;
         struct config_item *parent_item;
         struct configfs_subsystem *subsys;
         struct configfs_dirent *sd;
@@ -1070,25 +1071,30 @@ static int configfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
         snprintf(name, dentry->d_name.len + 1, "%s", dentry->d_name.name);
 
         mutex_lock(&subsys->su_mutex);
-        group = NULL;
-        item = NULL;
         if (type->ct_group_ops->make_group) {
-                ret = type->ct_group_ops->make_group(to_config_group(parent_item), name, &group);
-                if (!ret) {
+                group = type->ct_group_ops->make_group(to_config_group(parent_item), name);
+                if (!group)
+                        group = ERR_PTR(-ENOMEM);
+                if (!IS_ERR(group)) {
                         link_group(to_config_group(parent_item), group);
                         item = &group->cg_item;
-                }
+                } else
+                        ret = PTR_ERR(group);
         } else {
-                ret = type->ct_group_ops->make_item(to_config_group(parent_item), name, &item);
-                if (!ret)
+                item = type->ct_group_ops->make_item(to_config_group(parent_item), name);
+                if (!item)
+                        item = ERR_PTR(-ENOMEM);
+                if (!IS_ERR(item))
                         link_obj(parent_item, item);
+                else
+                        ret = PTR_ERR(item);
         }
         mutex_unlock(&subsys->su_mutex);
 
         kfree(name);
         if (ret) {
                 /*
-                 * If ret != 0, then link_obj() was never called.
+                 * If item == NULL, then link_obj() was never called.
                  * There are no extra references to clean up.
                  */
                 goto out_put;
diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 492d8caaaf25..c4e7d721bd8d 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -41,20 +41,16 @@ struct comm;
 struct nodes;
 struct node;
 
-static int make_cluster(struct config_group *, const char *,
-                        struct config_group **);
+static struct config_group *make_cluster(struct config_group *, const char *);
 static void drop_cluster(struct config_group *, struct config_item *);
 static void release_cluster(struct config_item *);
-static int make_space(struct config_group *, const char *,
-                      struct config_group **);
+static struct config_group *make_space(struct config_group *, const char *);
 static void drop_space(struct config_group *, struct config_item *);
 static void release_space(struct config_item *);
-static int make_comm(struct config_group *, const char *,
-                     struct config_item **);
+static struct config_item *make_comm(struct config_group *, const char *);
 static void drop_comm(struct config_group *, struct config_item *);
 static void release_comm(struct config_item *);
-static int make_node(struct config_group *, const char *,
-                     struct config_item **);
+static struct config_item *make_node(struct config_group *, const char *);
 static void drop_node(struct config_group *, struct config_item *);
 static void release_node(struct config_item *);
 
@@ -396,8 +392,8 @@ static struct node *to_node(struct config_item *i)
         return i ? container_of(i, struct node, item) : NULL;
 }
 
-static int make_cluster(struct config_group *g, const char *name,
-                        struct config_group **new_g)
+static struct config_group *make_cluster(struct config_group *g,
+                                         const char *name)
 {
         struct cluster *cl = NULL;
         struct spaces *sps = NULL;
@@ -435,15 +431,14 @@ static int make_cluster(struct config_group *g, const char *name,
 
         space_list = &sps->ss_group;
         comm_list = &cms->cs_group;
-        *new_g = &cl->group;
-        return 0;
+        return &cl->group;
 
  fail:
         kfree(cl);
         kfree(gps);
         kfree(sps);
         kfree(cms);
-        return -ENOMEM;
+        return ERR_PTR(-ENOMEM);
 }
 
 static void drop_cluster(struct config_group *g, struct config_item *i)
@@ -471,8 +466,7 @@ static void release_cluster(struct config_item *i)
         kfree(cl);
 }
 
-static int make_space(struct config_group *g, const char *name,
-                      struct config_group **new_g)
+static struct config_group *make_space(struct config_group *g, const char *name)
 {
         struct space *sp = NULL;
         struct nodes *nds = NULL;
@@ -495,14 +489,13 @@ static int make_space(struct config_group *g, const char *name,
         INIT_LIST_HEAD(&sp->members);
         mutex_init(&sp->members_lock);
         sp->members_count = 0;
-        *new_g = &sp->group;
-        return 0;
+        return &sp->group;
 
  fail:
         kfree(sp);
         kfree(gps);
         kfree(nds);
-        return -ENOMEM;
+        return ERR_PTR(-ENOMEM);
 }
 
 static void drop_space(struct config_group *g, struct config_item *i)
@@ -529,21 +522,19 @@ static void release_space(struct config_item *i)
         kfree(sp);
 }
 
-static int make_comm(struct config_group *g, const char *name,
-                     struct config_item **new_i)
+static struct config_item *make_comm(struct config_group *g, const char *name)
 {
         struct comm *cm;
 
         cm = kzalloc(sizeof(struct comm), GFP_KERNEL);
         if (!cm)
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
 
         config_item_init_type_name(&cm->item, name, &comm_type);
         cm->nodeid = -1;
         cm->local = 0;
         cm->addr_count = 0;
-        *new_i = &cm->item;
-        return 0;
+        return &cm->item;
 }
 
 static void drop_comm(struct config_group *g, struct config_item *i)
@@ -563,15 +554,14 @@ static void release_comm(struct config_item *i)
         kfree(cm);
 }
 
-static int make_node(struct config_group *g, const char *name,
-                     struct config_item **new_i)
+static struct config_item *make_node(struct config_group *g, const char *name)
 {
         struct space *sp = to_space(g->cg_item.ci_parent);
         struct node *nd;
 
         nd = kzalloc(sizeof(struct node), GFP_KERNEL);
         if (!nd)
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
 
         config_item_init_type_name(&nd->item, name, &node_type);
         nd->nodeid = -1;
@@ -583,8 +573,7 @@ static int make_node(struct config_group *g, const char *name,
         sp->members_count++;
         mutex_unlock(&sp->members_lock);
 
-        *new_i = &nd->item;
-        return 0;
+        return &nd->item;
 }
 
 static void drop_node(struct config_group *g, struct config_item *i)
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 443d108211ab..7dce1612553e 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1489,31 +1489,22 @@ static struct o2hb_heartbeat_group *to_o2hb_heartbeat_group(struct config_group
                 : NULL;
 }
 
-static int o2hb_heartbeat_group_make_item(struct config_group *group,
-                                          const char *name,
-                                          struct config_item **new_item)
+static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *group,
+                                                          const char *name)
 {
         struct o2hb_region *reg = NULL;
-        int ret = 0;
 
         reg = kzalloc(sizeof(struct o2hb_region), GFP_KERNEL);
-        if (reg == NULL) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        if (reg == NULL)
+                return ERR_PTR(-ENOMEM);
 
         config_item_init_type_name(&reg->hr_item, name, &o2hb_region_type);
 
-        *new_item = &reg->hr_item;
-
         spin_lock(&o2hb_live_lock);
         list_add_tail(&reg->hr_all_item, &o2hb_all_regions);
         spin_unlock(&o2hb_live_lock);
-out:
-        if (ret)
-                kfree(reg);
 
-        return ret;
+        return &reg->hr_item;
 }
 
 static void o2hb_heartbeat_group_drop_item(struct config_group *group,
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index b364b7052e46..816a3f61330c 100644
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -644,35 +644,23 @@ out:
         return ret;
 }
 
-static int o2nm_node_group_make_item(struct config_group *group,
-                                     const char *name,
-                                     struct config_item **new_item)
+static struct config_item *o2nm_node_group_make_item(struct config_group *group,
+                                                     const char *name)
 {
         struct o2nm_node *node = NULL;
-        int ret = 0;
 
-        if (strlen(name) > O2NM_MAX_NAME_LEN) {
-                ret = -ENAMETOOLONG;
-                goto out;
-        }
+        if (strlen(name) > O2NM_MAX_NAME_LEN)
+                return ERR_PTR(-ENAMETOOLONG);
 
         node = kzalloc(sizeof(struct o2nm_node), GFP_KERNEL);
-        if (node == NULL) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        if (node == NULL)
+                return ERR_PTR(-ENOMEM);
 
         strcpy(node->nd_name, name); /* use item.ci_namebuf instead? */
         config_item_init_type_name(&node->nd_item, name, &o2nm_node_type);
         spin_lock_init(&node->nd_lock);
 
-        *new_item = &node->nd_item;
-
-out:
-        if (ret)
-                kfree(node);
-
-        return ret;
+        return &node->nd_item;
 }
 
 static void o2nm_node_group_drop_item(struct config_group *group,
@@ -756,31 +744,25 @@ static struct o2nm_cluster_group *to_o2nm_cluster_group(struct config_group *gro
 }
 #endif
 
-static int o2nm_cluster_group_make_group(struct config_group *group,
-                                         const char *name,
-                                         struct config_group **new_group)
+static struct config_group *o2nm_cluster_group_make_group(struct config_group *group,
+                                                          const char *name)
 {
         struct o2nm_cluster *cluster = NULL;
         struct o2nm_node_group *ns = NULL;
-        struct config_group *o2hb_group = NULL;
+        struct config_group *o2hb_group = NULL, *ret = NULL;
         void *defs = NULL;
-        int ret = 0;
 
         /* this runs under the parent dir's i_mutex; there can be only
          * one caller in here at a time */
-        if (o2nm_single_cluster) {
-                ret = -ENOSPC;
-                goto out;
-        }
+        if (o2nm_single_cluster)
+                return ERR_PTR(-ENOSPC);
 
         cluster = kzalloc(sizeof(struct o2nm_cluster), GFP_KERNEL);
         ns = kzalloc(sizeof(struct o2nm_node_group), GFP_KERNEL);
         defs = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL);
         o2hb_group = o2hb_alloc_hb_set();
-        if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL) {
-                ret = -ENOMEM;
+        if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL)
                 goto out;
-        }
 
         config_group_init_type_name(&cluster->cl_group, name,
                                     &o2nm_cluster_type);
@@ -797,15 +779,16 @@ static int o2nm_cluster_group_make_group(struct config_group *group,
         cluster->cl_idle_timeout_ms    = O2NET_IDLE_TIMEOUT_MS_DEFAULT;
         cluster->cl_keepalive_delay_ms = O2NET_KEEPALIVE_DELAY_MS_DEFAULT;
 
-        *new_group = &cluster->cl_group;
+        ret = &cluster->cl_group;
         o2nm_single_cluster = cluster;
 
 out:
-        if (ret) {
+        if (ret == NULL) {
                 kfree(cluster);
                 kfree(ns);
                 o2hb_free_hb_set(o2hb_group);
                 kfree(defs);
+                ret = ERR_PTR(-ENOMEM);
         }
 
         return ret;
diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index 21f490f5d65c..d153946d6d15 100644
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -136,54 +136,6 @@ static const struct file_operations proc_tty_drivers_operations = {
         .release        = seq_release,
 };
 
-static void * tty_ldiscs_seq_start(struct seq_file *m, loff_t *pos)
-{
-        return (*pos < NR_LDISCS) ? pos : NULL;
-}
-
-static void * tty_ldiscs_seq_next(struct seq_file *m, void *v, loff_t *pos)
-{
-        (*pos)++;
-        return (*pos < NR_LDISCS) ? pos : NULL;
-}
-
-static void tty_ldiscs_seq_stop(struct seq_file *m, void *v)
-{
-}
-
-static int tty_ldiscs_seq_show(struct seq_file *m, void *v)
-{
-        int i = *(loff_t *)v;
-        struct tty_ldisc *ld;
-        
-        ld = tty_ldisc_get(i);
-        if (ld == NULL)
-                return 0;
-        seq_printf(m, "%-10s %2d\n", ld->name ? ld->name : "???", i);
-        tty_ldisc_put(i);
-        return 0;
-}
-
-static const struct seq_operations tty_ldiscs_seq_ops = {
-        .start  = tty_ldiscs_seq_start,
-        .next   = tty_ldiscs_seq_next,
-        .stop   = tty_ldiscs_seq_stop,
-        .show   = tty_ldiscs_seq_show,
-};
-
-static int proc_tty_ldiscs_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &tty_ldiscs_seq_ops);
-}
-
-static const struct file_operations tty_ldiscs_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_tty_ldiscs_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 /*
  * This function is called by tty_register_driver() to handle
  * registering the driver's /proc handler into /proc/tty/driver/<foo>
diff --git a/include/asm-avr32/ioctls.h b/include/asm-avr32/ioctls.h
index 0500426b7186..0cf2c0a4502b 100644
--- a/include/asm-avr32/ioctls.h
+++ b/include/asm-avr32/ioctls.h
@@ -47,6 +47,10 @@
 #define TIOCSBRK        0x5427  /* BSD compatibility */
 #define TIOCCBRK        0x5428  /* BSD compatibility */
 #define TIOCGSID        0x5429  /* Return the session ID of FD */
+#define TCGETS2         _IOR('T',0x2A, struct termios2)
+#define TCSETS2         _IOW('T',0x2B, struct termios2)
+#define TCSETSW2        _IOW('T',0x2C, struct termios2)
+#define TCSETSF2        _IOW('T',0x2D, struct termios2)
 #define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
 
diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild
index 17455459c43f..b7037d80d461 100644
--- a/include/asm-cris/Kbuild
+++ b/include/asm-cris/Kbuild
@@ -1,7 +1,8 @@
 include include/asm-generic/Kbuild.asm
 
-header-$(CONFIG_ETRAX_ARCH_V10) += arch-v10/
-header-$(CONFIG_ETRAX_ARCH_V32) += arch-v32/
+header-y += arch/
+header-y += arch-v10/
+header-y += arch-v32/
 
 header-y += ethernet.h
 header-y += rtc.h
diff --git a/include/asm-frv/ioctls.h b/include/asm-frv/ioctls.h
index 341c7ddef2a3..d0c30e31fbda 100644
--- a/include/asm-frv/ioctls.h
+++ b/include/asm-frv/ioctls.h
@@ -47,6 +47,10 @@
 #define TIOCSBRK        0x5427  /* BSD compatibility */
 #define TIOCCBRK        0x5428  /* BSD compatibility */
 #define TIOCGSID        0x5429  /* Return the session ID of FD */
+#define TCGETS2         _IOR('T',0x2A, struct termios2)
+#define TCSETS2         _IOW('T',0x2B, struct termios2)
+#define TCSETSW2        _IOW('T',0x2C, struct termios2)
+#define TCSETSF2        _IOW('T',0x2D, struct termios2)
 #define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
 
diff --git a/include/asm-frv/termbits.h b/include/asm-frv/termbits.h
index 74851b424d4f..5568492b5086 100644
--- a/include/asm-frv/termbits.h
+++ b/include/asm-frv/termbits.h
@@ -141,6 +141,7 @@ struct ktermios {
 #define HUPCL   0002000
 #define CLOCAL  0004000
 #define CBAUDEX 0010000
+#define    BOTHER 0010000
 #define    B57600 0010001
 #define   B115200 0010002
 #define   B230400 0010003
@@ -156,11 +157,13 @@ struct ktermios {
 #define  B3000000 0010015
 #define  B3500000 0010016
 #define  B4000000 0010017
-#define CIBAUD    002003600000  /* input baud rate (not used) */
+#define CIBAUD    002003600000          /* Input baud rate */
 #define CTVB      004000000000          /* VisioBraille Terminal flow control */
 #define CMSPAR    010000000000          /* mark or space (stick) parity */
 #define CRTSCTS   020000000000          /* flow control */
 
+#define IBSHIFT 16                      /* Shift from CBAUD to CIBAUD */
+
 /* c_lflag bits */
 #define ISIG    0000001
 #define ICANON  0000002
diff --git a/include/asm-m68k/amigahw.h b/include/asm-m68k/amigahw.h
index a16fe4e5a28a..5ca5dd951a4a 100644
--- a/include/asm-m68k/amigahw.h
+++ b/include/asm-m68k/amigahw.h
@@ -22,8 +22,6 @@
      *  Different Amiga models
      */
 
-extern unsigned long amiga_model;
-
 #define AMI_UNKNOWN     (0)
 #define AMI_500         (1)
 #define AMI_500PLUS     (2)
@@ -59,11 +57,9 @@ extern unsigned long amiga_chipset;
      */
 
 extern unsigned long amiga_eclock;      /* 700 kHz E Peripheral Clock */
-extern unsigned long amiga_masterclock; /* 28 MHz Master Clock */
 extern unsigned long amiga_colorclock;  /* 3.5 MHz Color Clock */
 extern unsigned long amiga_chip_size;   /* Chip RAM Size (bytes) */
 extern unsigned char amiga_vblank;      /* VBLANK Frequency */
-extern unsigned char amiga_psfreq;      /* Power Supply Frequency */
 
 
 #define AMIGAHW_DECLARE(name)   unsigned name : 1
diff --git a/include/asm-m68k/amigaints.h b/include/asm-m68k/amigaints.h
index 7c8713468fd2..b1bcdb835ab9 100644
--- a/include/asm-m68k/amigaints.h
+++ b/include/asm-m68k/amigaints.h
@@ -98,6 +98,8 @@
 #define CIA_ICR_ALL     0x1f
 #define CIA_ICR_SETCLR  0x80
 
+extern void amiga_init_IRQ(void);
+
 /* to access the interrupt control registers of CIA's use only
 ** these functions, they behave exactly like the amiga os routines
 */
diff --git a/include/asm-m68k/apollodma.h b/include/asm-m68k/apollodma.h
index 6821e3ba32e9..954adc851adb 100644
--- a/include/asm-m68k/apollodma.h
+++ b/include/asm-m68k/apollodma.h
@@ -1,4 +1,4 @@
-/* $Id: dma.h,v 1.7 1992/12/14 00:29:34 root Exp root $
+/*
  * linux/include/asm/dma.h: Defines for using and allocating dma channels.
  * Written by Hennus Bergman, 1992.
  * High DMA channel support & info by Hannu Savolainen
diff --git a/include/asm-m68k/dvma.h b/include/asm-m68k/dvma.h
index e1112de5a5e3..4fff408d0150 100644
--- a/include/asm-m68k/dvma.h
+++ b/include/asm-m68k/dvma.h
@@ -1,4 +1,4 @@
-/* $Id: dvma.h,v 1.4 1999/03/27 20:23:41 tsbogend Exp $
+/*
  * include/asm-m68k/dma.h
  *
  * Copyright 1995 (C) David S. Miller (davem@caip.rutgers.edu)
@@ -63,8 +63,6 @@ static inline int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr,
         return 0;
 }
 
-extern unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr);
-
 #else /* Sun3x */
 
 /* sun3x dvma page support */
diff --git a/include/asm-m68k/fpu.h b/include/asm-m68k/fpu.h
index 59701d7b4e78..ffb6b8cfc6d5 100644
--- a/include/asm-m68k/fpu.h
+++ b/include/asm-m68k/fpu.h
@@ -7,15 +7,15 @@
  */
 
 #if defined(CONFIG_M68020) || defined(CONFIG_M68030)
-#define FPSTATESIZE (216/sizeof(unsigned char))
+#define FPSTATESIZE (216)
 #elif defined(CONFIG_M68040)
-#define FPSTATESIZE (96/sizeof(unsigned char))
+#define FPSTATESIZE (96)
 #elif defined(CONFIG_M68KFPU_EMU)
-#define FPSTATESIZE (28/sizeof(unsigned char))
+#define FPSTATESIZE (28)
 #elif defined(CONFIG_M68060)
-#define FPSTATESIZE (12/sizeof(unsigned char))
+#define FPSTATESIZE (12)
 #else
-#define FPSTATESIZE error no_cpu_type_configured
+#define FPSTATESIZE (0)
 #endif
 
 #endif /* __M68K_FPU_H */
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index eb29a5260591..226bfc0f21b1 100644
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -24,7 +24,7 @@
 #elif defined(CONFIG_HP300)
 #define NR_IRQS 8
 #else
-#error unknown nr of irqs
+#define NR_IRQS 0
 #endif
 
 /*
diff --git a/include/asm-m68k/mac_baboon.h b/include/asm-m68k/mac_baboon.h
index e87850830be8..c2a042b8c349 100644
--- a/include/asm-m68k/mac_baboon.h
+++ b/include/asm-m68k/mac_baboon.h
@@ -29,6 +29,4 @@ struct baboon {
                                  */
 };
 
-extern volatile struct baboon *baboon;
-
 #endif /* __ASSEMBLY **/
diff --git a/include/asm-m68k/mac_via.h b/include/asm-m68k/mac_via.h
index 59b758cd16ad..39afb438b656 100644
--- a/include/asm-m68k/mac_via.h
+++ b/include/asm-m68k/mac_via.h
@@ -253,7 +253,6 @@
 
 extern volatile __u8 *via1,*via2;
 extern int rbv_present,via_alt_mapping;
-extern __u8 rbv_clear;
 
 static inline int rbv_set_video_bpp(int bpp)
 {
diff --git a/include/asm-m68k/machines.h b/include/asm-m68k/machines.h
index da6015a90f24..be667e84f01b 100644
--- a/include/asm-m68k/machines.h
+++ b/include/asm-m68k/machines.h
@@ -1,4 +1,4 @@
-/* $Id: machines.h,v 1.4 1995/11/25 02:31:58 davem Exp $
+/*
  * machines.h:  Defines for taking apart the machine type value in the
  *              idprom and determining the kind of machine we are on.
  *
@@ -21,8 +21,6 @@ struct Sun_Machine_Models {
 //#define NUM_SUN_MACHINES   23
 #define NUM_SUN_MACHINES  8
 
-extern struct Sun_Machine_Models Sun_Machines[NUM_SUN_MACHINES];
-
 /* The machine type in the idprom area looks like this:
  *
  * ---------------
diff --git a/include/asm-m68k/macintosh.h b/include/asm-m68k/macintosh.h
index 28b0f49ee521..05309f7e3d06 100644
--- a/include/asm-m68k/macintosh.h
+++ b/include/asm-m68k/macintosh.h
@@ -12,8 +12,6 @@ extern void mac_reset(void);
 extern void mac_poweroff(void);
 extern void mac_init_IRQ(void);
 extern int mac_irq_pending(unsigned int);
-extern void mac_identify(void);
-extern void mac_report_hardware(void);
 
 /*
  *      Floppy driver magic hook - probably shouldnt be here
@@ -21,9 +19,6 @@ extern void mac_report_hardware(void);
 
 extern void via1_set_head(int);
 
-extern void parse_booter(char *ptr);
-extern void print_booter(char *ptr);
-
 /*
  *      Macintosh Table
  */
diff --git a/include/asm-m68k/md.h b/include/asm-m68k/md.h
index 467ea08383e4..d2f78f226f3d 100644
--- a/include/asm-m68k/md.h
+++ b/include/asm-m68k/md.h
@@ -1,4 +1,4 @@
-/* $Id: md.h,v 1.1 1997/12/15 15:12:04 jj Exp $
+/*
  * md.h: High speed xor_block operation for RAID4/5
  *
  */
diff --git a/include/asm-m68k/openprom.h b/include/asm-m68k/openprom.h
index 869ab9176e9f..d33cdadf78e1 100644
--- a/include/asm-m68k/openprom.h
+++ b/include/asm-m68k/openprom.h
@@ -1,4 +1,3 @@
-/* $Id: openprom.h,v 1.19 1996/09/25 03:51:08 davem Exp $ */
 #ifndef __SPARC_OPENPROM_H
 #define __SPARC_OPENPROM_H
 
diff --git a/include/asm-m68k/oplib.h b/include/asm-m68k/oplib.h
index 06caa2d08451..f082d03336bd 100644
--- a/include/asm-m68k/oplib.h
+++ b/include/asm-m68k/oplib.h
@@ -1,4 +1,4 @@
-/* $Id: oplib.h,v 1.12 1996/10/31 06:29:13 davem Exp $
+/*
  * oplib.h:  Describes the interface and available routines in the
  *           Linux Prom library.
  *
@@ -19,7 +19,6 @@ enum prom_major_version {
         PROM_V2,      /* sun4c and early sun4m V2 prom */
         PROM_V3,      /* sun4m and later, up to sun4d/sun4e machines V3 */
         PROM_P1275,   /* IEEE compliant ISA based Sun PROM, only sun4u */
-        PROM_AP1000,  /* actually no prom at all */
 };
 
 extern enum prom_major_version prom_vers;
diff --git a/include/asm-m68k/sbus.h b/include/asm-m68k/sbus.h
index 3b25c0040aa6..bfe3ba147f2e 100644
--- a/include/asm-m68k/sbus.h
+++ b/include/asm-m68k/sbus.h
@@ -12,11 +12,6 @@ struct sbus_dev {
         } reg_addrs[1];
 };
 
-extern void *sparc_alloc_io (u32, void *, int, char *, u32, int);
-#define sparc_alloc_io(a,b,c,d,e,f)     (a)
-
-#define ARCH_SUN4  0
-
 /* sbus IO functions stolen from include/asm-sparc/io.h for the serial driver */
 /* No SBUS on the Sun3, kludge -- sam */
 
diff --git a/include/asm-m68k/sun3-head.h b/include/asm-m68k/sun3-head.h
index e74f384e269f..05af2f18b3bd 100644
--- a/include/asm-m68k/sun3-head.h
+++ b/include/asm-m68k/sun3-head.h
@@ -1,4 +1,3 @@
-/* $Id: head.h,v 1.32 1996/12/04 00:12:48 ecd Exp $ */
 #ifndef __SUN3_HEAD_H
 #define __SUN3_HEAD_H
 
diff --git a/include/asm-m68k/tlbflush.h b/include/asm-m68k/tlbflush.h
index 17707ec315e2..acb6bf21a321 100644
--- a/include/asm-m68k/tlbflush.h
+++ b/include/asm-m68k/tlbflush.h
@@ -16,7 +16,7 @@ static inline void flush_tlb_kernel_page(void *addr)
                                      ".chip 68k"
                                      : : "a" (addr));
                 set_fs(old_fs);
-        } else
+        } else if (CPU_IS_020_OR_030)
                 __asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr));
 }
 
@@ -29,7 +29,7 @@ static inline void __flush_tlb(void)
                 __asm__ __volatile__(".chip 68040\n\t"
                                      "pflushan\n\t"
                                      ".chip 68k");
-        else
+        else if (CPU_IS_020_OR_030)
                 __asm__ __volatile__("pflush #0,#4");
 }
 
@@ -45,7 +45,7 @@ static inline void __flush_tlb_one(unsigned long addr)
 {
         if (CPU_IS_040_OR_060)
                 __flush_tlb040_one(addr);
-        else
+        else if (CPU_IS_020_OR_030)
                 __asm__ __volatile__("pflush #0,#4,(%0)" : : "a" (addr));
 }
 
@@ -60,7 +60,7 @@ static inline void flush_tlb_all(void)
                 __asm__ __volatile__(".chip 68040\n\t"
                                      "pflusha\n\t"
                                      ".chip 68k");
-        else
+        else if (CPU_IS_020_OR_030)
                 __asm__ __volatile__("pflusha");
 }
 
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index 0488f937634a..d62c19ff041c 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -148,7 +148,8 @@ struct configfs_attribute {
  * items.  If the item is a group, it may support mkdir(2).
  * Groups supply one of make_group() and make_item().  If the
  * group supports make_group(), one can create group children.  If it
- * supports make_item(), one can create config_item children.  If it has
+ * supports make_item(), one can create config_item children.  make_group()
+ * and make_item() return ERR_PTR() on errors.  If it has
  * default_groups on group->default_groups, it has automatically created
  * group children.  default_groups may coexist alongsize make_group() or
  * make_item(), but if the group wishes to have only default_groups
@@ -165,8 +166,8 @@ struct configfs_item_operations {
 };
 
 struct configfs_group_operations {
-        int (*make_item)(struct config_group *group, const char *name, struct config_item **new_item);
-        int (*make_group)(struct config_group *group, const char *name, struct config_group **new_group);
+        struct config_item *(*make_item)(struct config_group *group, const char *name);
+        struct config_group *(*make_group)(struct config_group *group, const char *name);
         int (*commit_item)(struct config_item *item);
         void (*disconnect_notify)(struct config_group *group, struct config_item *item);
         void (*drop_item)(struct config_group *group, struct config_item *item);
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index 504cb2c3fa9a..2d3d1e04ba92 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -550,11 +550,11 @@ struct cyclades_icount {
 
 struct cyclades_port {
         int                     magic;
+        struct tty_port         port;
         struct cyclades_card    *card;
         int                     line;
         int                     flags;          /* defined in tty.h */
         int                     type;           /* UART type */
-        struct tty_struct       *tty;
         int                     read_status_mask;
         int                     ignore_status_mask;
         int                     timeout;
@@ -567,13 +567,8 @@ struct cyclades_port {
         int                     chip_rev;
         int                     custom_divisor;
         u8                      x_char; /* to be pushed out ASAP */
-        int                     close_delay;
-        unsigned short          closing_wait;
-        int                     count;  /* # of fd on device */
         int                     breakon;
         int                     breakoff;
-        int                     blocked_open; /* # of blocked opens */
-        unsigned char           *xmit_buf;
         int                     xmit_head;
         int                     xmit_tail;
         int                     xmit_cnt;
@@ -583,16 +578,14 @@ struct cyclades_port {
         struct cyclades_monitor mon;
         struct cyclades_idle_stats      idle_stats;
         struct cyclades_icount  icount;
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
         struct completion       shutdown_wait;
         wait_queue_head_t       delta_msr_wait;
         int throttle;
 };
 
 #define CLOSING_WAIT_DELAY      30*HZ
-#define CY_CLOSING_WAIT_NONE    65535
-#define CY_CLOSING_WAIT_INF     0
+#define CY_CLOSING_WAIT_NONE    ASYNC_CLOSING_WAIT_NONE
+#define CY_CLOSING_WAIT_INF     ASYNC_CLOSING_WAIT_INF
 
 
 #define CyMAX_CHIPS_PER_CARD    8
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index 110833666e37..4cc913939817 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -14,6 +14,7 @@
 
 #ifdef __KERNEL__
 #include <linux/mutex.h>
+#include <linux/tty.h>
 
 struct real_driver {
   void                    (*disable_tx_interrupts) (void *);
@@ -33,17 +34,12 @@ struct real_driver {
 
 struct gs_port {
   int                     magic;
+  struct tty_port         port;
   unsigned char           *xmit_buf; 
   int                     xmit_head;
   int                     xmit_tail;
   int                     xmit_cnt;
   struct mutex            port_write_mutex;
-  int                     flags;
-  wait_queue_head_t       open_wait;
-  wait_queue_head_t       close_wait;
-  int                     count;
-  int                     blocked_open;
-  struct tty_struct       *tty;
   unsigned long           event;
   unsigned short          closing_wait;
   int                     close_delay;
diff --git a/include/linux/hayesesp.h b/include/linux/hayesesp.h
index 2177ee5b2fe2..940aeb51d53f 100644
--- a/include/linux/hayesesp.h
+++ b/include/linux/hayesesp.h
@@ -76,11 +76,10 @@ struct hayes_esp_config {
 
 struct esp_struct {
         int                     magic;
+        struct tty_port         port;
         spinlock_t              lock;
-        int                     port;
+        int                     io_port;
         int                     irq;
-        int                     flags;          /* defined in tty.h */
-        struct tty_struct       *tty;
         int                     read_status_mask;
         int                     ignore_status_mask;
         int                     timeout;
@@ -93,14 +92,10 @@ struct esp_struct {
         int                     MCR;    /* Modem control register */
         unsigned long           last_active;
         int                     line;
-        int                     count;      /* # of fd on device */
-        int                     blocked_open; /* # of blocked opens */
         unsigned char           *xmit_buf;
         int                     xmit_head;
         int                     xmit_tail;
         int                     xmit_cnt;
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
         wait_queue_head_t       delta_msr_wait;
         wait_queue_head_t       break_wait;
         struct async_icount     icount; /* kernel counters for the 4 input interrupts */
diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index 5a84fe944b74..0d1840723249 100644
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -51,25 +51,21 @@
  */
 struct stliport {
         unsigned long           magic;
+        struct tty_port         port;
         unsigned int            portnr;
         unsigned int            panelnr;
         unsigned int            brdnr;
         unsigned long           state;
         unsigned int            devnr;
-        int                     flags;
         int                     baud_base;
         int                     custom_divisor;
         int                     close_delay;
         int                     closing_wait;
-        int                     refcount;
         int                     openwaitcnt;
         int                     rc;
         int                     argsize;
         void                    *argp;
         unsigned int            rxmarkmsk;
-        struct tty_struct       *tty;
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
         wait_queue_head_t       raw_wait;
         struct asysigs          asig;
         unsigned long           addr;
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index d8f31de632c5..f3a1c0e45021 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -190,6 +190,7 @@ struct uart_ops {
         void            (*break_ctl)(struct uart_port *, int ctl);
         int             (*startup)(struct uart_port *);
         void            (*shutdown)(struct uart_port *);
+        void            (*flush_buffer)(struct uart_port *);
         void            (*set_termios)(struct uart_port *, struct ktermios *new,
                                        struct ktermios *old);
         void            (*set_ldisc)(struct uart_port *);
@@ -343,13 +344,15 @@ typedef unsigned int __bitwise__ uif_t;
  * stuff here.
  */
 struct uart_info {
-        struct tty_struct       *tty;
+        struct tty_port         port;
         struct circ_buf         xmit;
         uif_t                   flags;
 
 /*
  * Definitions for info->flags.  These are _private_ to serial_core, and
  * are specific to this structure.  They may be queried by low level drivers.
+ *
+ * FIXME: use the ASY_ definitions
  */
 #define UIF_CHECK_CD            ((__force uif_t) (1 << 25))
 #define UIF_CTS_FLOW            ((__force uif_t) (1 << 26))
@@ -357,11 +360,7 @@ struct uart_info {
 #define UIF_INITIALIZED         ((__force uif_t) (1 << 31))
 #define UIF_SUSPENDED           ((__force uif_t) (1 << 30))
 
-        int                     blocked_open;
-
         struct tasklet_struct   tlet;
-
-        wait_queue_head_t       open_wait;
         wait_queue_head_t       delta_msr_wait;
 };
 
@@ -438,8 +437,8 @@ int uart_resume_port(struct uart_driver *reg, struct uart_port *port);
 #define uart_circ_chars_free(circ)      \
         (CIRC_SPACE((circ)->head, (circ)->tail, UART_XMIT_SIZE))
 
-#define uart_tx_stopped(port)           \
-        ((port)->info->tty->stopped || (port)->info->tty->hw_stopped)
+#define uart_tx_stopped(portp)          \
+        ((portp)->info->port.tty->stopped || (portp)->info->port.tty->hw_stopped)
 
 /*
  * The following are helper functions for the low level drivers.
@@ -450,7 +449,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
 #ifdef SUPPORT_SYSRQ
         if (port->sysrq) {
                 if (ch && time_before(jiffies, port->sysrq)) {
-                        handle_sysrq(ch, port->info ? port->info->tty : NULL);
+                        handle_sysrq(ch, port->info ? port->info->port.tty : NULL);
                         port->sysrq = 0;
                         return 1;
                 }
@@ -479,7 +478,7 @@ static inline int uart_handle_break(struct uart_port *port)
         }
 #endif
         if (port->flags & UPF_SAK)
-                do_SAK(info->tty);
+                do_SAK(info->port.tty);
         return 0;
 }
 
@@ -502,9 +501,9 @@ uart_handle_dcd_change(struct uart_port *port, unsigned int status)
 
         if (info->flags & UIF_CHECK_CD) {
                 if (status)
-                        wake_up_interruptible(&info->open_wait);
-                else if (info->tty)
-                        tty_hangup(info->tty);
+                        wake_up_interruptible(&info->port.open_wait);
+                else if (info->port.tty)
+                        tty_hangup(info->port.tty);
         }
 }
 
@@ -517,7 +516,7 @@ static inline void
 uart_handle_cts_change(struct uart_port *port, unsigned int status)
 {
         struct uart_info *info = port->info;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->port.tty;
 
         port->icount.cts++;
 
@@ -543,7 +542,7 @@ static inline void
 uart_insert_char(struct uart_port *port, unsigned int status,
                  unsigned int overrun, unsigned int ch, unsigned int flag)
 {
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
 
         if ((status & port->ignore_status_mask & ~overrun) == 0)
                 tty_insert_flip_char(tty, ch, flag);
diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index 0424d75a5aaa..336af33c6ea4 100644
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -69,6 +69,7 @@ struct stlrq {
  */
 struct stlport {
         unsigned long           magic;
+        struct tty_port         port;
         unsigned int            portnr;
         unsigned int            panelnr;
         unsigned int            brdnr;
@@ -76,12 +77,10 @@ struct stlport {
         int                     uartaddr;
         unsigned int            pagenr;
         unsigned long           istate;
-        int                     flags;
         int                     baud_base;
         int                     custom_divisor;
         int                     close_delay;
         int                     closing_wait;
-        int                     refcount;
         int                     openwaitcnt;
         int                     brklen;
         unsigned int            sigs;
@@ -92,9 +91,6 @@ struct stlport {
         unsigned long           clk;
         unsigned long           hwid;
         void                    *uartp;
-        struct tty_struct       *tty;
-        wait_queue_head_t       open_wait;
-        wait_queue_head_t       close_wait;
         comstats_t              stats;
         struct stlrq            tx;
 };
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 324a3b231d40..4e5833073aa6 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -71,7 +71,8 @@ struct tty_bufhead {
         struct tty_buffer *head;        /* Queue head */
         struct tty_buffer *tail;        /* Active buffer */
         struct tty_buffer *free;        /* Free queue head */
-        int memory_used;                /* Buffer space used excluding free queue */
+        int memory_used;                /* Buffer space used excluding
+                                                                free queue */
 };
 /*
  * When a break, frame error, or parity error happens, these codes are
@@ -101,71 +102,96 @@ struct tty_bufhead {
 #define LNEXT_CHAR(tty) ((tty)->termios->c_cc[VLNEXT])
 #define EOL2_CHAR(tty) ((tty)->termios->c_cc[VEOL2])
 
-#define _I_FLAG(tty,f)  ((tty)->termios->c_iflag & (f))
-#define _O_FLAG(tty,f)  ((tty)->termios->c_oflag & (f))
-#define _C_FLAG(tty,f)  ((tty)->termios->c_cflag & (f))
-#define _L_FLAG(tty,f)  ((tty)->termios->c_lflag & (f))
-
-#define I_IGNBRK(tty)   _I_FLAG((tty),IGNBRK)
-#define I_BRKINT(tty)   _I_FLAG((tty),BRKINT)
-#define I_IGNPAR(tty)   _I_FLAG((tty),IGNPAR)
-#define I_PARMRK(tty)   _I_FLAG((tty),PARMRK)
-#define I_INPCK(tty)    _I_FLAG((tty),INPCK)
-#define I_ISTRIP(tty)   _I_FLAG((tty),ISTRIP)
-#define I_INLCR(tty)    _I_FLAG((tty),INLCR)
-#define I_IGNCR(tty)    _I_FLAG((tty),IGNCR)
-#define I_ICRNL(tty)    _I_FLAG((tty),ICRNL)
-#define I_IUCLC(tty)    _I_FLAG((tty),IUCLC)
-#define I_IXON(tty)     _I_FLAG((tty),IXON)
-#define I_IXANY(tty)    _I_FLAG((tty),IXANY)
-#define I_IXOFF(tty)    _I_FLAG((tty),IXOFF)
-#define I_IMAXBEL(tty)  _I_FLAG((tty),IMAXBEL)
-#define I_IUTF8(tty)    _I_FLAG((tty),IUTF8)
-
-#define O_OPOST(tty)    _O_FLAG((tty),OPOST)
-#define O_OLCUC(tty)    _O_FLAG((tty),OLCUC)
-#define O_ONLCR(tty)    _O_FLAG((tty),ONLCR)
-#define O_OCRNL(tty)    _O_FLAG((tty),OCRNL)
-#define O_ONOCR(tty)    _O_FLAG((tty),ONOCR)
-#define O_ONLRET(tty)   _O_FLAG((tty),ONLRET)
-#define O_OFILL(tty)    _O_FLAG((tty),OFILL)
-#define O_OFDEL(tty)    _O_FLAG((tty),OFDEL)
-#define O_NLDLY(tty)    _O_FLAG((tty),NLDLY)
-#define O_CRDLY(tty)    _O_FLAG((tty),CRDLY)
-#define O_TABDLY(tty)   _O_FLAG((tty),TABDLY)
-#define O_BSDLY(tty)    _O_FLAG((tty),BSDLY)
-#define O_VTDLY(tty)    _O_FLAG((tty),VTDLY)
-#define O_FFDLY(tty)    _O_FLAG((tty),FFDLY)
-
-#define C_BAUD(tty)     _C_FLAG((tty),CBAUD)
-#define C_CSIZE(tty)    _C_FLAG((tty),CSIZE)
-#define C_CSTOPB(tty)   _C_FLAG((tty),CSTOPB)
-#define C_CREAD(tty)    _C_FLAG((tty),CREAD)
-#define C_PARENB(tty)   _C_FLAG((tty),PARENB)
-#define C_PARODD(tty)   _C_FLAG((tty),PARODD)
-#define C_HUPCL(tty)    _C_FLAG((tty),HUPCL)
-#define C_CLOCAL(tty)   _C_FLAG((tty),CLOCAL)
-#define C_CIBAUD(tty)   _C_FLAG((tty),CIBAUD)
-#define C_CRTSCTS(tty)  _C_FLAG((tty),CRTSCTS)
-
-#define L_ISIG(tty)     _L_FLAG((tty),ISIG)
-#define L_ICANON(tty)   _L_FLAG((tty),ICANON)
-#define L_XCASE(tty)    _L_FLAG((tty),XCASE)
-#define L_ECHO(tty)     _L_FLAG((tty),ECHO)
-#define L_ECHOE(tty)    _L_FLAG((tty),ECHOE)
-#define L_ECHOK(tty)    _L_FLAG((tty),ECHOK)
-#define L_ECHONL(tty)   _L_FLAG((tty),ECHONL)
-#define L_NOFLSH(tty)   _L_FLAG((tty),NOFLSH)
-#define L_TOSTOP(tty)   _L_FLAG((tty),TOSTOP)
-#define L_ECHOCTL(tty)  _L_FLAG((tty),ECHOCTL)
-#define L_ECHOPRT(tty)  _L_FLAG((tty),ECHOPRT)
-#define L_ECHOKE(tty)   _L_FLAG((tty),ECHOKE)
-#define L_FLUSHO(tty)   _L_FLAG((tty),FLUSHO)
-#define L_PENDIN(tty)   _L_FLAG((tty),PENDIN)
-#define L_IEXTEN(tty)   _L_FLAG((tty),IEXTEN)
+#define _I_FLAG(tty, f) ((tty)->termios->c_iflag & (f))
+#define _O_FLAG(tty, f) ((tty)->termios->c_oflag & (f))
+#define _C_FLAG(tty, f) ((tty)->termios->c_cflag & (f))
+#define _L_FLAG(tty, f) ((tty)->termios->c_lflag & (f))
+
+#define I_IGNBRK(tty)   _I_FLAG((tty), IGNBRK)
+#define I_BRKINT(tty)   _I_FLAG((tty), BRKINT)
+#define I_IGNPAR(tty)   _I_FLAG((tty), IGNPAR)
+#define I_PARMRK(tty)   _I_FLAG((tty), PARMRK)
+#define I_INPCK(tty)    _I_FLAG((tty), INPCK)
+#define I_ISTRIP(tty)   _I_FLAG((tty), ISTRIP)
+#define I_INLCR(tty)    _I_FLAG((tty), INLCR)
+#define I_IGNCR(tty)    _I_FLAG((tty), IGNCR)
+#define I_ICRNL(tty)    _I_FLAG((tty), ICRNL)
+#define I_IUCLC(tty)    _I_FLAG((tty), IUCLC)
+#define I_IXON(tty)     _I_FLAG((tty), IXON)
+#define I_IXANY(tty)    _I_FLAG((tty), IXANY)
+#define I_IXOFF(tty)    _I_FLAG((tty), IXOFF)
+#define I_IMAXBEL(tty)  _I_FLAG((tty), IMAXBEL)
+#define I_IUTF8(tty)    _I_FLAG((tty), IUTF8)
+
+#define O_OPOST(tty)    _O_FLAG((tty), OPOST)
+#define O_OLCUC(tty)    _O_FLAG((tty), OLCUC)
+#define O_ONLCR(tty)    _O_FLAG((tty), ONLCR)
+#define O_OCRNL(tty)    _O_FLAG((tty), OCRNL)
+#define O_ONOCR(tty)    _O_FLAG((tty), ONOCR)
+#define O_ONLRET(tty)   _O_FLAG((tty), ONLRET)
+#define O_OFILL(tty)    _O_FLAG((tty), OFILL)
+#define O_OFDEL(tty)    _O_FLAG((tty), OFDEL)
+#define O_NLDLY(tty)    _O_FLAG((tty), NLDLY)
+#define O_CRDLY(tty)    _O_FLAG((tty), CRDLY)
+#define O_TABDLY(tty)   _O_FLAG((tty), TABDLY)
+#define O_BSDLY(tty)    _O_FLAG((tty), BSDLY)
+#define O_VTDLY(tty)    _O_FLAG((tty), VTDLY)
+#define O_FFDLY(tty)    _O_FLAG((tty), FFDLY)
+
+#define C_BAUD(tty)     _C_FLAG((tty), CBAUD)
+#define C_CSIZE(tty)    _C_FLAG((tty), CSIZE)
+#define C_CSTOPB(tty)   _C_FLAG((tty), CSTOPB)
+#define C_CREAD(tty)    _C_FLAG((tty), CREAD)
+#define C_PARENB(tty)   _C_FLAG((tty), PARENB)
+#define C_PARODD(tty)   _C_FLAG((tty), PARODD)
+#define C_HUPCL(tty)    _C_FLAG((tty), HUPCL)
+#define C_CLOCAL(tty)   _C_FLAG((tty), CLOCAL)
+#define C_CIBAUD(tty)   _C_FLAG((tty), CIBAUD)
+#define C_CRTSCTS(tty)  _C_FLAG((tty), CRTSCTS)
+
+#define L_ISIG(tty)     _L_FLAG((tty), ISIG)
+#define L_ICANON(tty)   _L_FLAG((tty), ICANON)
+#define L_XCASE(tty)    _L_FLAG((tty), XCASE)
+#define L_ECHO(tty)     _L_FLAG((tty), ECHO)
+#define L_ECHOE(tty)    _L_FLAG((tty), ECHOE)
+#define L_ECHOK(tty)    _L_FLAG((tty), ECHOK)
+#define L_ECHONL(tty)   _L_FLAG((tty), ECHONL)
+#define L_NOFLSH(tty)   _L_FLAG((tty), NOFLSH)
+#define L_TOSTOP(tty)   _L_FLAG((tty), TOSTOP)
+#define L_ECHOCTL(tty)  _L_FLAG((tty), ECHOCTL)
+#define L_ECHOPRT(tty)  _L_FLAG((tty), ECHOPRT)
+#define L_ECHOKE(tty)   _L_FLAG((tty), ECHOKE)
+#define L_FLUSHO(tty)   _L_FLAG((tty), FLUSHO)
+#define L_PENDIN(tty)   _L_FLAG((tty), PENDIN)
+#define L_IEXTEN(tty)   _L_FLAG((tty), IEXTEN)
 
 struct device;
 struct signal_struct;
+
+/*
+ * Port level information. Each device keeps its own port level information
+ * so provide a common structure for those ports wanting to use common support
+ * routines.
+ *
+ * The tty port has a different lifetime to the tty so must be kept apart.
+ * In addition be careful as tty -> port mappings are valid for the life
+ * of the tty object but in many cases port -> tty mappings are valid only
+ * until a hangup so don't use the wrong path.
+ */
+
+struct tty_port {
+        struct tty_struct       *tty;           /* Back pointer */
+        int                     blocked_open;   /* Waiting to open */
+        int                     count;          /* Usage count */
+        wait_queue_head_t       open_wait;      /* Open waiters */
+        wait_queue_head_t       close_wait;     /* Close waiters */
+        unsigned long           flags;          /* TTY flags ASY_*/
+        struct mutex            mutex;          /* Locking */
+        unsigned char           *xmit_buf;      /* Optional buffer */
+        int                     close_delay;    /* Close port delay */
+        int                     closing_wait;   /* Delay for output */
+};
+
 /*
  * Where all of the state associated with a tty is kept while the tty
  * is open.  Since the termios state should be kept even if the tty
@@ -185,6 +211,7 @@ struct tty_struct {
         struct tty_driver *driver;
         const struct tty_operations *ops;
         int index;
+        /* The ldisc objects are protected by tty_ldisc_lock at the moment */
         struct tty_ldisc ldisc;
         struct mutex termios_mutex;
         spinlock_t ctrl_lock;
@@ -213,7 +240,7 @@ struct tty_struct {
         struct list_head tty_files;
 
 #define N_TTY_BUF_SIZE 4096
-        
+
         /*
          * The following is data for the N_TTY line discipline.  For
          * historical reasons, this is included in the tty structure.
@@ -241,6 +268,7 @@ struct tty_struct {
         spinlock_t read_lock;
         /* If the tty has a pending do_SAK, queue it here - akpm */
         struct work_struct SAK_work;
+        struct tty_port *port;
 };
 
 /* tty magic number */
@@ -248,14 +276,14 @@ struct tty_struct {
 
 /*
  * These bits are used in the flags field of the tty structure.
- * 
+ *
  * So that interrupts won't be able to mess up the queues,
  * copy_to_cooked must be atomic with respect to itself, as must
  * tty->write.  Thus, you must use the inline functions set_bit() and
  * clear_bit() to make things atomic.
  */
 #define TTY_THROTTLED           0       /* Call unthrottle() at threshold min */
-#define TTY_IO_ERROR            1       /* Canse an I/O error (may be no ldisc too) */
+#define TTY_IO_ERROR            1       /* Cause an I/O error (may be no ldisc too) */
 #define TTY_OTHER_CLOSED        2       /* Other side (if any) has closed */
 #define TTY_EXCLUSIVE           3       /* Exclusive open mode */
 #define TTY_DEBUG               4       /* Debugging */
@@ -285,11 +313,11 @@ extern int vcs_init(void);
 extern int tty_paranoia_check(struct tty_struct *tty, struct inode *inode,
                               const char *routine);
 extern char *tty_name(struct tty_struct *tty, char *buf);
-extern void tty_wait_until_sent(struct tty_struct * tty, long timeout);
-extern int tty_check_change(struct tty_struct * tty);
-extern void stop_tty(struct tty_struct * tty);
-extern void start_tty(struct tty_struct * tty);
-extern int tty_register_ldisc(int disc, struct tty_ldisc *new_ldisc);
+extern void tty_wait_until_sent(struct tty_struct *tty, long timeout);
+extern int tty_check_change(struct tty_struct *tty);
+extern void stop_tty(struct tty_struct *tty);
+extern void start_tty(struct tty_struct *tty);
+extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
 extern int tty_unregister_ldisc(int disc);
 extern int tty_register_driver(struct tty_driver *driver);
 extern int tty_unregister_driver(struct tty_driver *driver);
@@ -310,10 +338,10 @@ extern int is_current_pgrp_orphaned(void);
 extern struct pid *tty_get_pgrp(struct tty_struct *tty);
 extern int is_ignored(int sig);
 extern int tty_signal(int sig, struct tty_struct *tty);
-extern void tty_hangup(struct tty_struct * tty);
-extern void tty_vhangup(struct tty_struct * tty);
+extern void tty_hangup(struct tty_struct *tty);
+extern void tty_vhangup(struct tty_struct *tty);
 extern void tty_unhangup(struct file *filp);
-extern int tty_hung_up_p(struct file * filp);
+extern int tty_hung_up_p(struct file *filp);
 extern void do_SAK(struct tty_struct *tty);
 extern void __do_SAK(struct tty_struct *tty);
 extern void disassociate_ctty(int priv);
@@ -322,17 +350,17 @@ extern void tty_flip_buffer_push(struct tty_struct *tty);
 extern speed_t tty_get_baud_rate(struct tty_struct *tty);
 extern speed_t tty_termios_baud_rate(struct ktermios *termios);
 extern speed_t tty_termios_input_baud_rate(struct ktermios *termios);
-extern void tty_termios_encode_baud_rate(struct ktermios *termios, speed_t ibaud, speed_t obaud);
-extern void tty_encode_baud_rate(struct tty_struct *tty, speed_t ibaud, speed_t obaud);
+extern void tty_termios_encode_baud_rate(struct ktermios *termios,
+                                                speed_t ibaud, speed_t obaud);
+extern void tty_encode_baud_rate(struct tty_struct *tty,
+                                                speed_t ibaud, speed_t obaud);
 extern void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old);
 extern int tty_termios_hw_change(struct ktermios *a, struct ktermios *b);
 
 extern struct tty_ldisc *tty_ldisc_ref(struct tty_struct *);
 extern void tty_ldisc_deref(struct tty_ldisc *);
 extern struct tty_ldisc *tty_ldisc_ref_wait(struct tty_struct *);
-
-extern struct tty_ldisc *tty_ldisc_get(int);
-extern void tty_ldisc_put(int);
+extern const struct file_operations tty_ldiscs_proc_fops;
 
 extern void tty_wakeup(struct tty_struct *tty);
 extern void tty_ldisc_flush(struct tty_struct *tty);
@@ -351,10 +379,14 @@ extern void tty_write_unlock(struct tty_struct *tty);
 extern int tty_write_lock(struct tty_struct *tty, int ndelay);
 #define tty_is_writelocked(tty)  (mutex_is_locked(&tty->atomic_write_lock))
 
+extern void tty_port_init(struct tty_port *port);
+extern int tty_port_alloc_xmit_buf(struct tty_port *port);
+extern void tty_port_free_xmit_buf(struct tty_port *port);
+
 
 
 /* n_tty.c */
-extern struct tty_ldisc tty_ldisc_N_TTY;
+extern struct tty_ldisc_ops tty_ldisc_N_TTY;
 
 /* tty_audit.c */
 #ifdef CONFIG_AUDIT
@@ -363,7 +395,8 @@ extern void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
 extern void tty_audit_exit(void);
 extern void tty_audit_fork(struct signal_struct *sig);
 extern void tty_audit_push(struct tty_struct *tty);
-extern void tty_audit_push_task(struct task_struct *tsk, uid_t loginuid, u32 sessionid);
+extern void tty_audit_push_task(struct task_struct *tsk,
+                                        uid_t loginuid, u32 sessionid);
 #else
 static inline void tty_audit_add_data(struct tty_struct *tty,
                                       unsigned char *data, size_t size)
@@ -378,19 +411,20 @@ static inline void tty_audit_fork(struct signal_struct *sig)
 static inline void tty_audit_push(struct tty_struct *tty)
 {
 }
-static inline void tty_audit_push_task(struct task_struct *tsk, uid_t loginuid, u32 sessionid)
+static inline void tty_audit_push_task(struct task_struct *tsk,
+                                        uid_t loginuid, u32 sessionid)
 {
 }
 #endif
 
 /* tty_ioctl.c */
-extern int n_tty_ioctl(struct tty_struct * tty, struct file * file,
+extern int n_tty_ioctl(struct tty_struct *tty, struct file *file,
                        unsigned int cmd, unsigned long arg);
 
 /* serial.c */
 
 extern void serial_console_init(void);
- 
+
 /* pcxx.c */
 
 extern int pcxe_open(struct tty_struct *tty, struct file *filp);
@@ -401,7 +435,7 @@ extern void console_print(const char *);
 
 /* vt.c */
 
-extern int vt_ioctl(struct tty_struct *tty, struct file * file,
+extern int vt_ioctl(struct tty_struct *tty, struct file *file,
                     unsigned int cmd, unsigned long arg);
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 6226504d9108..40f38d896777 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -104,7 +104,7 @@
 #include <linux/fs.h>
 #include <linux/wait.h>
 
-struct tty_ldisc {
+struct tty_ldisc_ops {
         int     magic;
         char    *name;
         int     num;
@@ -142,6 +142,11 @@ struct tty_ldisc {
         int refcount;
 };
 
+struct tty_ldisc {
+        struct tty_ldisc_ops *ops;
+        int refcount;
+};
+
 #define TTY_LDISC_MAGIC 0x5403
 
 #define LDISC_FLAG_DEFINED      0x00000001
diff --git a/init/main.c b/init/main.c
index edeace036fd9..756eca4b821a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -630,9 +630,10 @@ asmlinkage void __init start_kernel(void)
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start && !initrd_below_start_ok &&
-                        initrd_start < min_low_pfn << PAGE_SHIFT) {
+            page_to_pfn(virt_to_page(initrd_start)) < min_low_pfn) {
                 printk(KERN_CRIT "initrd overwritten (0x%08lx < 0x%08lx) - "
-                    "disabling it.\n",initrd_start,min_low_pfn << PAGE_SHIFT);
+                    "disabling it.\n",
+                    page_to_pfn(virt_to_page(initrd_start)), min_low_pfn);
                 initrd_start = 0;
         }
 #endif
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 5d163571d3f7..d3340dd52bcf 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -643,14 +643,7 @@ static void rfcomm_tty_wakeup(unsigned long arg)
                 return;
 
         BT_DBG("dev %p tty %p", dev, tty);
-
-        if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && tty->ldisc.write_wakeup)
-                (tty->ldisc.write_wakeup)(tty);
-
-        wake_up_interruptible(&tty->write_wait);
-#ifdef SERIAL_HAVE_POLL_WAIT
-        wake_up_interruptible(&tty->poll_wait);
-#endif
+        tty_wakeup(tty);
 }
 
 static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev)
@@ -1059,9 +1052,7 @@ static void rfcomm_tty_flush_buffer(struct tty_struct *tty)
                 return;
 
         skb_queue_purge(&dev->dlc->tx_queue);
-
-        if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && tty->ldisc.write_wakeup)
-                tty->ldisc.write_wakeup(tty);
+        tty_wakeup(tty);
 }
 
 static void rfcomm_tty_send_xchar(struct tty_struct *tty, char ch)
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index 76c3057d0179..e4e2caeb9d82 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -650,12 +650,7 @@ static void ircomm_tty_do_softint(struct work_struct *work)
         }
 
         /* Check if user (still) wants to be waken up */
-        if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
-            tty->ldisc.write_wakeup)
-        {
-                (tty->ldisc.write_wakeup)(tty);
-        }
-        wake_up_interruptible(&tty->write_wait);
+        tty_wakeup(tty);
 }
 
 /*
@@ -1141,6 +1136,7 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
                                       struct sk_buff *skb)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
+        struct tty_ldisc *ld;
 
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
@@ -1173,7 +1169,11 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
          * involve the flip buffers, since we are not running in an interrupt
          * handler
          */
-        self->tty->ldisc.receive_buf(self->tty, skb->data, NULL, skb->len);
+
+        ld = tty_ldisc_ref(self->tty);
+        if (ld)
+                ld->ops->receive_buf(self->tty, skb->data, NULL, skb->len);
+        tty_ldisc_deref(ld);
 
         /* No need to kfree_skb - see ircomm_ttp_data_indication() */