m68knommu: add info about removing mcfserial

Schedule a removal for this driver. Alternative driver is available for
a while now.

Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 3c35d452b1a968439cdbb2b270bcaa75b26b762d..5b3f31faed56872b84fbd293494613f6d627a987 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -289,6 +289,14 @@ Who:       Glauber Costa <gcosta@redhat.com>
 
 ---------------------------
 
+What:  old style serial driver for ColdFire (CONFIG_SERIAL_COLDFIRE)
+When:  2.6.28
+Why:   This driver still uses the old interface and has been replaced
+       by CONFIG_SERIAL_MCF.
+Who:   Sebastian Siewior <sebastian@breakpoint.cc>
+
+---------------------------
+
 What:  /sys/o2cb symlink
 When:  January 2010
 Why:   /sys/fs/o2cb is the proper location for this information - /sys/o2cb

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 36acbcca2d4893c4aa3178e0d7e426cff2029f90..62e6eb136a3c2a7f582fa7c493e1a669469fecbe 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -976,11 +976,15 @@ config SERIAL_68328_RTS_CTS
        depends on SERIAL_68328
 
 config SERIAL_COLDFIRE
-       bool "ColdFire serial support"
+       bool "ColdFire serial support (DEPRECATED)"
        depends on COLDFIRE
        help
          This driver supports the built-in serial ports of the Motorola ColdFire
          family of CPUs.
+         This driver is deprecated because it supports only the old interface
+         for serial drivers and features like magic keys are not working.
+         Please switch to the new style driver because this driver will be
+         removed soon.
 
 config SERIAL_MCF
        bool "Coldfire serial support (new style driver)"

diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 43af40d59b8af44717621150e13194afd85efdff..56007cc8a9b31c24cd75390a932c4d426efec9f8 100644 (file)
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -1,3 +1,4 @@
+#warning This driver is deprecated. Check Kconfig for details.
 /*
  * mcfserial.c -- serial driver for ColdFire internal UARTS.
  *