[PATCH] remove CONFIG_SERIAL_21285_OLD

From: Adrian Bunk <bunk@fs.tum.de>

CONFIG_SERIAL_21285_OLD depends on the non-existent option CONFIG_OBSOLETE,
IOW it's not selectable, and the help text says "This is obsolete and will
be removed during later 2.5 development.".

diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 1ed0bfcfa1e48a23fd8a2d719f4e2cf08006fb26..f06ccd6a73a0395cf3d1ab43e65cf24b9794eaac 100644 (file)
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -481,18 +481,6 @@ static int __init serial21285_console_setup(struct console *co, char *options)
 }
 
 extern struct uart_driver serial21285_reg;
-#ifdef CONFIG_SERIAL_21285_OLD
-static struct console serial21285_old_cons =
-{
-       .name           = SERIAL_21285_OLD_NAME,
-       .write          = serial21285_console_write,
-       .device         = uart_console_device,
-       .setup          = serial21285_console_setup,
-       .flags          = CON_PRINTBUFFER,
-       .index          = -1,
-       .data           = &serial21285_reg,
-};
-#endif
 
 static struct console serial21285_console =
 {

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 333aa2f78f150dc9c610fbbb0116e59184444735..1fa81a3c83dfd2638702e287a2836a98066d96d0 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -257,13 +257,6 @@ config SERIAL_21285
          PCI bridge you can enable its onboard serial port by enabling this
          option.
 
-config SERIAL_21285_OLD
-       bool "Use /dev/ttyS0 device (OBSOLETE)"
-       depends on SERIAL_21285=y && OBSOLETE
-       help
-         Use the old /dev/ttyS name, major 4 minor 64.  This is obsolete
-         and will be removed during later 2.5 development.
-
 config SERIAL_21285_CONSOLE
        bool "Console on DC21285 serial port"
        depends on SERIAL_21285=y