Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (60 commits)
  [ARM] 4524/1: S3C: Move register out of include/asm-arm/arch-s3c2410
  [ARM] 4523/1: S3C: Remove FIFO_MAX from uncompression headers
  [ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h
  [ARM] 4521/2: S3C: Reorganise VA mapping headers
  [ARM] 4520/1: S3C: Remove old VA values from static map
  [ARM] 4519/1: S3C: split S3C2400 values out of S3C24XX map.h
  [ARM] 4518/1: S3C: Rename watchdog configuration options
  [ARM] 4517/1: S3C: Fix debug macros for ARM926 output
  [ARM] 4516/1: S3C: Fix uncompressor serial output for ARM926
  [ARM] 4515/1: S3C: Move uncompress code to plat-s3c
  [ARM] 4514/1: S3C: Rename DEBUG_S3C2410_PORT and DEBUG_S3C_UART
  [ARM] 4513/1: S3C: Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT
  [ARM] 4512/1: S3C: rename the debug macros for per-cpu updates
  [ARM] 4511/1: S3C: updated LLSERIAL Kconfig defines for CPU support
  [ARM] 4510/1: S3C: split debug-macro support into plat-s3c
  [ARM] 4509/1: S3C: Create initial arch/arm/plat-s3c
  [ARM] 4508/1: S3C: Move items to include/asm-arm/plat-s3c
  [ARM] 4461/1: MXC platform and i.MX31ADS core support
  [ARM] 4507/1: pxa2xx clock_event_device
  [ARM] 4497/1: Only allow safe cache configurations on ARMv6 and later
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 40c5eb1f55c7..18101f5f5f24 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -82,24 +82,24 @@ config DEBUG_CLPS711X_UART2
           output to the second serial port on these devices.  Saying N will
           cause the debug messages to appear on the first serial port.
 
-config DEBUG_S3C2410_PORT
-        depends on DEBUG_LL && ARCH_S3C2410
-        bool "Kernel low-level debugging messages via S3C2410 UART"
+config DEBUG_S3C_PORT
+        depends on DEBUG_LL && PLAT_S3C
+        bool "Kernel low-level debugging messages via S3C UART"
         help
           Say Y here if you want debug print routines to go to one of the
-          S3C2410 internal UARTs. The chosen UART must have been configured
+          S3C internal UARTs. The chosen UART must have been configured
           before it is used.
 
-config DEBUG_S3C2410_UART
-        depends on ARCH_S3C2410
-        int "S3C2410 UART to use for low-level debug"
+config DEBUG_S3C_UART
+        depends on PLAT_S3C
+        int "S3C UART to use for low-level debug"
         default "0"
         help
-          Choice for UART for kernel low-level using S3C2410 UARTS,
+          Choice for UART for kernel low-level using S3C UARTS,
           should be between zero and two. The port must have been
           initialised by the boot-loader before use.
 
           The uncompressor code port configuration is now handled
-          by CONFIG_S3C2410_LOWLEVEL_UART_PORT.
+          by CONFIG_S3C_LOWLEVEL_UART_PORT.
 
 endmenu