Merge branch 'pxa' into devel

[linux-2.6] / arch / arm / mach-ns9xxx / Kconfig

diff --git a/arch/arm/mach-ns9xxx/Kconfig b/arch/arm/mach-ns9xxx/Kconfig
index 8175ba92a2fabd55f7d56386cf9d2dcf25d5e321..8584ed107991bee83fb8ffc57d07cead0d5c32c3 100644 (file)
--- a/arch/arm/mach-ns9xxx/Kconfig
+++ b/arch/arm/mach-ns9xxx/Kconfig
@@ -3,19 +3,30 @@ if ARCH_NS9XXX
 menu "NS9xxx Implementations"
 
 config MACH_CC9P9360DEV
-       bool "Connect Core 9P 9360 on an A9M9750 Devboard"
+       bool "ConnectCore 9P 9360 on an A9M9750 Devboard"
        select PROCESSOR_NS9360
        select BOARD_A9M9750DEV
        help
-         Say Y here if you are using the Digi Connect Core 9P 9360
+         Say Y here if you are using the Digi ConnectCore 9P 9360
          on an A9M9750 Development Board.
 
+config MACH_CC9P9360JS
+       bool "ConnectCore 9P 9360 on a JSCC9P9360 Devboard"
+       select PROCESSOR_NS9360
+       select BOARD_JSCC9P9360
+       help
+         Say Y here if you are using the Digi ConnectCore 9P 9360
+         on an JSCC9P9360 Development Board.
+
 config PROCESSOR_NS9360
        bool
 
 config BOARD_A9M9750DEV
        bool
 
+config BOARD_JSCC9P9360
+       bool
+
 endmenu
 
 endif