summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-26 11:49:00 +0400
committerOlof Johansson <olof@lixom.net>2012-11-26 11:49:00 +0400
commit6cc96ddb7eed3a5a368d13ef6f79ab7c48dfbfcc (patch)
tree55c634a3b44660d8e1ce4907bc1ea55602416e57
parent2054271bb008de0bcf0bdc5d6041613f616420f2 (diff)
parentd90cb69ddd032854b633c4069ba3493651cb8ebc (diff)
downloadlinux-6cc96ddb7eed3a5a368d13ef6f79ab7c48dfbfcc.tar.xz
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical
From Haojian Zhuang: * 'armsoc/fix' of git://github.com/hzhuang1/linux: ARM: pxa: add dummy SA1100 rtc clock in pxa25x
-rw-r--r--arch/arm/mach-pxa/pxa25x.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index aeb913eee8a6..3f5171eaf67b 100644
--- 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 =