summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear13xx
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-12-02 14:51:55 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-12 17:39:36 +0100
commit4b6effb6ff38aab60d224cefba76b016552f8bf8 (patch)
tree176c300163c884c5390a188c2c29d6bba66f30a4 /arch/arm/mach-spear13xx
parentd42799b7827bcb92c47de26f900e75885bcb447b (diff)
downloadop-kernel-dev-4b6effb6ff38aab60d224cefba76b016552f8bf8.zip
op-kernel-dev-4b6effb6ff38aab60d224cefba76b016552f8bf8.tar.gz
ARM: spear: merge Kconfig files
As a preparation to merging the spear platforms into one directory, this merges the four Kconfig files into one. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm/mach-spear13xx')
-rw-r--r--arch/arm/mach-spear13xx/Kconfig20
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/mach-spear13xx/Kconfig b/arch/arm/mach-spear13xx/Kconfig
deleted file mode 100644
index eaadc66..0000000
--- a/arch/arm/mach-spear13xx/Kconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# SPEAr13XX Machine configuration file
-#
-
-if ARCH_SPEAR13XX
-
-menu "SPEAr13xx Implementations"
-config MACH_SPEAR1310
- bool "SPEAr1310 Machine support with Device Tree"
- select PINCTRL_SPEAR1310
- help
- Supports ST SPEAr1310 machine configured via the device-tree
-
-config MACH_SPEAR1340
- bool "SPEAr1340 Machine support with Device Tree"
- select PINCTRL_SPEAR1340
- help
- Supports ST SPEAr1340 machine configured via the device-tree
-endmenu
-endif #ARCH_SPEAR13XX
OpenPOWER on IntegriCloud