Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into nex…

…t/fixes-non-critical From Haojian Zhuang: * 'armsoc/fix' of git://github.com/hzhuang1/linux: ARM: pxa: add dummy SA1100 rtc clock in pxa25x
git-mirror · Nov 26, 2012 · 6cc96dd · 6cc96dd
2 parents 2054271 + d90cb69
commit 6cc96dd
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
@@ -209,6 +209,7 @@ static struct clk_lookup pxa25x_clkregs[] = {
 	INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
 	INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),
 	INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
+	INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
 static struct clk_lookup pxa25x_hwuart_clkreg =