diff options
| author | Pawel Moll <pawel.moll@arm.com> | 2012-07-25 10:49:34 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 12:37:57 (GMT) |
| commit | 49121304a9831449a841ca0c77dc0ad8697e23c9 (patch) | |
| tree | 41d3f4222433906d9c6184f022a52e0e594df40e | |
| parent | 8cef081c71dd4e16a01a1e63cedab21eef8b5735 (diff) | |
| download | linux-49121304a9831449a841ca0c77dc0ad8697e23c9.tar.xz | |
ARM: versatile: Don't use platform clock for Integrator & VE
Due to automatic merge of a613163dff04cbfcb7d66b06ef4a5f65498ee59b
"ARM: integrator: convert to common clock" and
56a34b03ff427046494db87f05fc810aaedd23a5 "ARM: versatile: Make
plat-versatile clock optional" two platforms: Integrator and
Versatile Express now select both COMMON_CLK and
PLAT_VERSATILE_CLOCK which breaks building them. Fixed now.
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b25c9d3..9124ff7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -279,7 +279,6 @@ config ARCH_INTEGRATOR select ICST select GENERIC_CLOCKEVENTS select PLAT_VERSATILE - select PLAT_VERSATILE_CLOCK select PLAT_VERSATILE_FPGA_IRQ select NEED_MACH_IO_H select NEED_MACH_MEMORY_H @@ -336,7 +335,6 @@ config ARCH_VEXPRESS select ICST select NO_IOPORT select PLAT_VERSATILE - select PLAT_VERSATILE_CLOCK select PLAT_VERSATILE_CLCD select REGULATOR_FIXED_VOLTAGE if REGULATOR help |