aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Siewior <bigeasy@linutronix.de>2008-05-14 19:05:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-14 22:11:12 -0400
commitf7c5a770e6006ae2b5f4fd0491565b69e4d4bb48 (patch)
tree6802b84b29c445b2885ebfd3b76381ab8eb426ab
parent57cc097931e2d28a27e19515c549dc301ba6b6b2 (diff)
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>
-rw-r--r--Documentation/feature-removal-schedule.txt8
-rw-r--r--drivers/serial/Kconfig6
-rw-r--r--drivers/serial/mcfserial.c1
3 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 3c35d452b1a9..5b3f31faed56 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -289,6 +289,14 @@ Who: Glauber Costa <gcosta@redhat.com>
289 289
290--------------------------- 290---------------------------
291 291
292What: old style serial driver for ColdFire (CONFIG_SERIAL_COLDFIRE)
293When: 2.6.28
294Why: This driver still uses the old interface and has been replaced
295 by CONFIG_SERIAL_MCF.
296Who: Sebastian Siewior <sebastian@breakpoint.cc>
297
298---------------------------
299
292What: /sys/o2cb symlink 300What: /sys/o2cb symlink
293When: January 2010 301When: January 2010
294Why: /sys/fs/o2cb is the proper location for this information - /sys/o2cb 302Why: /sys/fs/o2cb is the proper location for this information - /sys/o2cb
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 36acbcca2d48..62e6eb136a3c 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -976,11 +976,15 @@ config SERIAL_68328_RTS_CTS
976 depends on SERIAL_68328 976 depends on SERIAL_68328
977 977
978config SERIAL_COLDFIRE 978config SERIAL_COLDFIRE
979 bool "ColdFire serial support" 979 bool "ColdFire serial support (DEPRECATED)"
980 depends on COLDFIRE 980 depends on COLDFIRE
981 help 981 help
982 This driver supports the built-in serial ports of the Motorola ColdFire 982 This driver supports the built-in serial ports of the Motorola ColdFire
983 family of CPUs. 983 family of CPUs.
984 This driver is deprecated because it supports only the old interface
985 for serial drivers and features like magic keys are not working.
986 Please switch to the new style driver because this driver will be
987 removed soon.
984 988
985config SERIAL_MCF 989config SERIAL_MCF
986 bool "Coldfire serial support (new style driver)" 990 bool "Coldfire serial support (new style driver)"
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 43af40d59b8a..56007cc8a9b3 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -1,3 +1,4 @@
1#warning This driver is deprecated. Check Kconfig for details.
1/* 2/*
2 * mcfserial.c -- serial driver for ColdFire internal UARTS. 3 * mcfserial.c -- serial driver for ColdFire internal UARTS.
3 * 4 *