Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (69 commits)
  [POWERPC] Add SPE registers to core dumps
  [POWERPC] Use regset code for compat PTRACE_*REGS* calls
  [POWERPC] Use generic compat_sys_ptrace
  [POWERPC] Use generic compat_ptrace_request
  [POWERPC] Use generic ptrace peekdata/pokedata
  [POWERPC] Use regset code for PTRACE_*REGS* requests
  [POWERPC] Switch to generic compat_binfmt_elf code
  [POWERPC] Switch to using user_regset-based core dumps
  [POWERPC] Add user_regset compat support
  [POWERPC] Add user_regset_view definitions
  [POWERPC] Use user_regset accessors for GPRs
  [POWERPC] ptrace accessors for special regs MSR and TRAP
  [POWERPC] Use user_regset accessors for SPE regs
  [POWERPC] Use user_regset accessors for altivec regs
  [POWERPC] Use user_regset accessors for FP regs
  [POWERPC] mpc52xx: fix compile error introduce when rebasing patch
  [POWERPC] 4xx: PCIe indirect DCR spinlock fix.
  [POWERPC] Add missing native dcr dcr_ind_lock spinlock
  [POWERPC] 4xx: Fix offset value on Warp board
  [POWERPC] 4xx: Add 440EPx Sequoia ehci dts entry
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 50d6e2214ddf..84a054d7e986 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1142,17 +1142,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
@@ -1160,7 +1160,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