The patch below (already approved by Russell King) still applies (with a
few lines offset) against current 2.6 kernels.
Please apply
Adrian
----- Forwarded message from Adrian Bunk <[email protected]> -----
Date: Mon, 14 Jul 2003 00:41:11 +0200
From: Adrian Bunk <[email protected]>
To: Russell King <[email protected]>, [email protected]
Cc: [email protected], [email protected]
Subject: [2.5 patch] remove CONFIG_SERIAL_21285_OLD
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.".
Is the patch below to remove this option OK?
cu
Adrian
--- linux-2.5.75-mm1/drivers/serial/Kconfig.old 2003-07-14 00:35:38.000000000 +0200
+++ linux-2.5.75-mm1/drivers/serial/Kconfig 2003-07-14 00:36:26.000000000 +0200
@@ -249,13 +249,6 @@
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
--- linux-2.5.75-mm1/drivers/serial/21285.c.old 2003-07-14 00:37:07.000000000 +0200
+++ linux-2.5.75-mm1/drivers/serial/21285.c 2003-07-14 00:38:16.000000000 +0200
@@ -481,18 +481,6 @@
}
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 =
{