diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 20:30:31 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 20:50:01 (GMT) |
| commit | 1b361942b53c33f38d55065c13785aadb5103a18 (patch) | |
| tree | 07b26d32b175f27f18f1fca3d5944a58f89cd17f /arch/arm/Kconfig | |
| parent | 61b464aef0e306f141dbc0bb3f9c58049a987a7e (diff) | |
| parent | bcf3e72eff584136600a51a5b30ef7a794664d19 (diff) | |
| download | linux-fsl-qoriq-1b361942b53c33f38d55065c13785aadb5103a18.tar.xz | |
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/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1cacda4..5fa0cc5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -933,16 +933,8 @@ config ARCH_NOMADIK help Support for the Nomadik platform by ST-Ericsson -config PLAT_SPEAR +config PLAT_SPEAR_SINGLE bool "ST SPEAr" - select ARCH_HAS_CPUFREQ - select ARCH_REQUIRE_GPIOLIB - select ARM_AMBA - select CLKDEV_LOOKUP - select CLKSRC_MMIO - select COMMON_CLK - select GENERIC_CLOCKEVENTS - select HAVE_CLK help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -1104,7 +1096,7 @@ source "arch/arm/plat-samsung/Kconfig" source "arch/arm/mach-socfpga/Kconfig" -source "arch/arm/plat-spear/Kconfig" +source "arch/arm/mach-spear/Kconfig" source "arch/arm/mach-s3c24xx/Kconfig" |