Merge NetSilicon NS93xx tree

Fixed conflicts:

	arch/arm/Makefile
	arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/mach-ns9xxx/Kconfig b/arch/arm/mach-ns9xxx/Kconfig
new file mode 100644
index 000000000000..8175ba92a2fa
--- /dev/null
+++ b/arch/arm/mach-ns9xxx/Kconfig
@@ -0,0 +1,21 @@
+if ARCH_NS9XXX
+
+menu "NS9xxx Implementations"
+
+config MACH_CC9P9360DEV
+        bool "Connect Core 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
+          on an A9M9750 Development Board.
+
+config PROCESSOR_NS9360
+        bool
+
+config BOARD_A9M9750DEV
+        bool
+
+endmenu
+
+endif