Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for-2.6.25

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 4fa7927997ad..ddfb1eab7363 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1138,17 +1138,17 @@ config SERIAL_SGI_L1_CONSOLE
                 say Y.  Otherwise, say N.
 
 config SERIAL_MPC52xx
-        tristate "Freescale MPC52xx family PSC serial support"
-        depends on PPC_MPC52xx
+        tristate "Freescale MPC52xx/MPC512x family PSC serial support"
+        depends on PPC_MPC52xx || PPC_MPC512x
         select SERIAL_CORE
         help
-          This drivers support the MPC52xx PSC serial ports. If you would
-          like to use them, you must answer Y or M to this option. Not that
+          This driver supports MPC52xx and MPC512x PSC serial ports. If you would
+          like to use them, you must answer Y or M to this option. Note that
           for use as console, it must be included in kernel and not as a
           module.
 
 config SERIAL_MPC52xx_CONSOLE
-        bool "Console on a Freescale MPC52xx family PSC serial port"
+        bool "Console on a Freescale MPC52xx/MPC512x family PSC serial port"
         depends on SERIAL_MPC52xx=y
         select SERIAL_CORE_CONSOLE
         help
@@ -1156,7 +1156,7 @@ config SERIAL_MPC52xx_CONSOLE
           of the Freescale MPC52xx family as a console.
 
 config SERIAL_MPC52xx_CONSOLE_BAUD
-        int "Freescale MPC52xx family PSC serial port baud"
+        int "Freescale MPC52xx/MPC512x family PSC serial port baud"
         depends on SERIAL_MPC52xx_CONSOLE=y
         default "9600"
         help