4 files changed, 7 insertions, 11 deletions

diff --git a/drivers/staging/speakup/serialio.h b/drivers/staging/speakup/serialio.h
index 614271f9b99f..55d68b5ad165 100644
--- a/drivers/staging/speakup/serialio.h
+++ b/drivers/staging/speakup/serialio.h
@@ -1,8 +1,7 @@
 #ifndef _SPEAKUP_SERIAL_H
 #define _SPEAKUP_SERIAL_H
 
-#include <linux/serial.h>       /* for rs_table, serial constants &
-                                   serial_uart_config */
+#include <linux/serial.h>       /* for rs_table, serial constants */
 #include <linux/serial_reg.h>   /* for more serial constants */
 #ifndef __sparc__
 #include <asm/serial.h>
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index 972b5212b58c..0c5e908df0b5 100644
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -26,9 +26,6 @@ struct old_serial_port {
         unsigned long irqflags;
 };
 
-/*
- * This replaces serial_uart_config in include/linux/serial.h
- */
 struct serial8250_config {
         const char      *name;
         unsigned short  fifo_size;
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index d9190957a5f4..b97913dcdbff 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -58,6 +58,12 @@
 enum su_type { SU_PORT_NONE, SU_PORT_MS, SU_PORT_KBD, SU_PORT_PORT };
 static char *su_typev[] = { "su(???)", "su(mouse)", "su(kbd)", "su(serial)" };
 
+struct serial_uart_config {
+        char    *name;
+        int     dfl_xmit_fifo_size;
+        int     flags;
+};
+
 /*
  * Here we define the default xmit fifo size used for each type of UART.
  */
diff --git a/include/linux/serial.h b/include/linux/serial.h
index 3504f428ce66..861e51de476b 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -86,12 +86,6 @@ struct serial_struct {
 #define SERIAL_IO_HUB6  1
 #define SERIAL_IO_MEM   2
 
-struct serial_uart_config {
-        char    *name;
-        int     dfl_xmit_fifo_size;
-        int     flags;
-};
-
 #define UART_CLEAR_FIFO         0x01
 #define UART_USE_FIFO           0x02
 #define UART_STARTECH           0x04