diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 22:30:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 22:50:01 +0200 |
| commit | 1b361942b53c33f38d55065c13785aadb5103a18 (patch) | |
| tree | 07b26d32b175f27f18f1fca3d5944a58f89cd17f /arch/arm/mach-spear13xx/Kconfig | |
| parent | Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup (diff) | |
| parent | ARM: spear: enable spear13xx in multi_v7_defconfig (diff) | |
| download | linux-1b361942b53c33f38d55065c13785aadb5103a18.tar.xz linux-1b361942b53c33f38d55065c13785aadb5103a18.zip | |
Merge branch 'spear/multiplatform' into late/cleanup
This is a prerequisite for the spear/dwdma series.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear13xx/Kconfig')
| -rw-r--r-- | arch/arm/mach-spear13xx/Kconfig | 20 |
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 eaadc66d96b3..000000000000 --- 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 |