Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

1 files changed, 2 insertions, 15 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index b87b1cf9df66..db783b77a881 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -9,7 +9,6 @@ menu "Serial drivers"
 # The new 8250/16550 serial drivers
 config SERIAL_8250
         tristate "8250/16550 and compatible serial support"
-        depends on (BROKEN || !SPARC)
         select SERIAL_CORE
         ---help---
           This selects whether you want to include the driver for the standard
@@ -994,24 +993,12 @@ config SERIAL_68328_RTS_CTS
         bool "Support RTS/CTS on 68328 serial port"
         depends on SERIAL_68328
 
-config SERIAL_COLDFIRE
-        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)"
+        bool "Coldfire serial support"
         depends on COLDFIRE
         select SERIAL_CORE
         help
-          This new serial driver supports the Freescale Coldfire serial ports
-          using the new serial driver subsystem.
+          This serial driver supports the Freescale Coldfire serial ports.
 
 config SERIAL_MCF_BAUDRATE
         int "Default baudrate for Coldfire serial ports"