diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:02 -0400 |
| commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /drivers/rtc | |
| parent | b31fc7af78e17b0203e1cd5a195c590e8adeae0d (diff) | |
| parent | 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 (diff) | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-pl031.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index 3587d9922f28..71bbefc3544e 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c | |||
| @@ -456,7 +456,7 @@ static struct rtc_class_ops stv2_pl031_ops = { | |||
| 456 | .irq_set_freq = pl031_irq_set_freq, | 456 | .irq_set_freq = pl031_irq_set_freq, |
| 457 | }; | 457 | }; |
| 458 | 458 | ||
| 459 | static struct amba_id pl031_ids[] __initdata = { | 459 | static struct amba_id pl031_ids[] = { |
| 460 | { | 460 | { |
| 461 | .id = 0x00041031, | 461 | .id = 0x00041031, |
| 462 | .mask = 0x000fffff, | 462 | .mask = 0x000fffff, |