Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49121304 authored by Pawel Moll's avatar Pawel Moll Committed by Arnd Bergmann
Browse files

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



Due to automatic merge of a613163d
"ARM: integrator: convert to common clock" and
56a34b03 "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: default avatarPawel Moll <pawel.moll@arm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 8cef081c

arch/arm/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -279,7 +279,6 @@ config ARCH_INTEGRATOR 
	select ICST

	select ICST

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLOCK

	select PLAT_VERSATILE_FPGA_IRQ

	select PLAT_VERSATILE_FPGA_IRQ

	select NEED_MACH_IO_H

	select NEED_MACH_IO_H

	select NEED_MACH_MEMORY_H

	select NEED_MACH_MEMORY_H
@@ -336,7 +335,6 @@ config ARCH_VEXPRESS 
	select ICST

	select ICST

	select NO_IOPORT

	select NO_IOPORT

	select PLAT_VERSATILE

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLOCK

	select PLAT_VERSATILE_CLCD

	select PLAT_VERSATILE_CLCD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	help

	help