[SERIAL] Remove obsolete CLPS711x serial driver names.

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 33dc331cf5dca3316715571dfc58a918e8a99d72..7fc4d3b1bb273606857fa8a926e2ff8972589641 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -250,12 +250,6 @@ config SERIAL_CLPS711X_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
-config SERIAL_CLPS711X_OLD_NAME
-       bool "Use the old 2.4 names for CLPS711X serial port"
-       depends on SERIAL_CLPS711X=y
-       help
-         ::: To be written :::
-
 config SERIAL_DZ
        bool "DECstation DZ serial driver"
        depends on DECSTATION

diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 1848756ca2bfde7d9925078427fa296bb1dcacf1..3d85e1baa61784f1330cf3322061aad9526ecd4c 100644 (file)
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -49,19 +49,10 @@
 
 #define UART_NR                2
 
-#ifndef CONFIG_SERIAL_CLPS711X_OLD_NAME
 #define SERIAL_CLPS711X_MAJOR  204
 #define SERIAL_CLPS711X_MINOR  40
 #define SERIAL_CLPS711X_NR     UART_NR
 
-#else
-#warning The old names/device number for this driver if compatabity is needed
-#define SERIAL_CLPS711X_MAJOR   204
-#define SERIAL_CLPS711X_MINOR   16
-#define SERIAL_CLPS711X_NR      UART_NR
-
-#endif
-
 /*
  * We use the relevant SYSCON register as a base address for these ports.
  */