diff options
| author | Pawel Moll <pawel.moll@arm.com> | 2012-07-25 06:49:34 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 08:37:57 -0400 |
| commit | 49121304a9831449a841ca0c77dc0ad8697e23c9 (patch) | |
| tree | 41d3f4222433906d9c6184f022a52e0e594df40e | |
| parent | 8cef081c71dd4e16a01a1e63cedab21eef8b5735 (diff) | |
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 b25c9d3c379a..9124ff75fe53 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -279,7 +279,6 @@ config ARCH_INTEGRATOR | |||
| 279 | select ICST | 279 | select ICST |
| 280 | select GENERIC_CLOCKEVENTS | 280 | select GENERIC_CLOCKEVENTS |
| 281 | select PLAT_VERSATILE | 281 | select PLAT_VERSATILE |
| 282 | select PLAT_VERSATILE_CLOCK | ||
| 283 | select PLAT_VERSATILE_FPGA_IRQ | 282 | select PLAT_VERSATILE_FPGA_IRQ |
| 284 | select NEED_MACH_IO_H | 283 | select NEED_MACH_IO_H |
| 285 | select NEED_MACH_MEMORY_H | 284 | select NEED_MACH_MEMORY_H |
| @@ -336,7 +335,6 @@ config ARCH_VEXPRESS | |||
| 336 | select ICST | 335 | select ICST |
| 337 | select NO_IOPORT | 336 | select NO_IOPORT |
| 338 | select PLAT_VERSATILE | 337 | select PLAT_VERSATILE |
| 339 | select PLAT_VERSATILE_CLOCK | ||
| 340 | select PLAT_VERSATILE_CLCD | 338 | select PLAT_VERSATILE_CLCD |
| 341 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 339 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
| 342 | help | 340 | help |