summaryrefslogtreecommitdiff
path: root/arch/arm/mach-spear6xx/clock.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-08-04 15:43:45 +0400
committerTony Lindgren <tony@atomide.com>2010-08-04 15:43:45 +0400
commit7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch)
treee7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mach-spear6xx/clock.c
parent7e788b4289bb025a96e327c604cb2db92e17108f (diff)
parent869fef41547db95df8523bf67845a21313709428 (diff)
downloadlinux-7590d1defdc720a97a9e186f45f529c4ae1b40f7.tar.xz
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-spear6xx/clock.c')
-rw-r--r--arch/arm/mach-spear6xx/clock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-spear6xx/clock.c b/arch/arm/mach-spear6xx/clock.c
index 13e27c769685..36ff056b7321 100644
--- a/arch/arm/mach-spear6xx/clock.c
+++ b/arch/arm/mach-spear6xx/clock.c
@@ -428,8 +428,11 @@ static struct clk gpio2_clk = {
.recalc = &follow_parent,
};
+static struct clk dummy_apb_pclk;
+
/* array of all spear 6xx clock lookups */
static struct clk_lookup spear_clk_lookups[] = {
+ { .con_id = "apb_pclk", .clk = &dummy_apb_pclk},
/* root clks */
{ .con_id = "osc_32k_clk", .clk = &osc_32k_clk},
{ .con_id = "osc_30m_clk", .clk = &osc_30m_clk},