diff options
author | Pawel Moll <pawel.moll@arm.com> | 2012-07-25 12:49:34 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 14:37:57 +0200 |
commit | 49121304a9831449a841ca0c77dc0ad8697e23c9 (patch) | |
tree | 41d3f4222433906d9c6184f022a52e0e594df40e /sound/soc | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
download | linux-49121304a9831449a841ca0c77dc0ad8697e23c9.tar.xz linux-49121304a9831449a841ca0c77dc0ad8697e23c9.zip |
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>
Diffstat (limited to 'sound/soc')
0 files changed, 0 insertions, 0 deletions