ARM: versatile: Don't use platform clock for Integrator & VE

Due to automatic merge of a613163 "ARM: integrator: convert to common clock" and 56a34b0 "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 <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
AnTAVR · Jul 25, 2012 · 4912130 · 4912130
1 parent 8cef081
commit 4912130
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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