From: Pawel Moll Date: Wed, 25 Jul 2012 10:49:34 +0000 (+0100) Subject: ARM: versatile: Don't use platform clock for Integrator & VE X-Git-Tag: v3.6-rc1~75^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49121304a9831449a841ca0c77dc0ad8697e23c9;p=pandora-kernel.git 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 Signed-off-by: Arnd Bergmann --- Reading git-diff-tree failed