git.cascardo.info Git - cascardo/linux.git/commit

author	Pawel Moll <pawel.moll@arm.com>
	Wed, 25 Jul 2012 10:49:34 +0000 (11:49 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Wed, 25 Jul 2012 12:37:57 +0000 (14:37 +0200)
commit	49121304a9831449a841ca0c77dc0ad8697e23c9
tree	41d3f4222433906d9c6184f022a52e0e594df40e	tree \| snapshot
parent	8cef081c71dd4e16a01a1e63cedab21eef8b5735	commit \| 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>