diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-26 02:49:00 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-26 02:49:00 -0500 |
| commit | 6cc96ddb7eed3a5a368d13ef6f79ab7c48dfbfcc (patch) | |
| tree | 55c634a3b44660d8e1ce4907bc1ea55602416e57 | |
| parent | 2054271bb008de0bcf0bdc5d6041613f616420f2 (diff) | |
| parent | d90cb69ddd032854b633c4069ba3493651cb8ebc (diff) | |
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.c | 1 |
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[] = { | |||
| 209 | INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"), | 209 | INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"), |
| 210 | INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL), | 210 | INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL), |
| 211 | INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL), | 211 | INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL), |
| 212 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 212 | }; | 213 | }; |
| 213 | 214 | ||
| 214 | static struct clk_lookup pxa25x_hwuart_clkreg = | 215 | static struct clk_lookup pxa25x_hwuart_clkreg = |