diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
| commit | 53582c4c508a95ece9f7c907edef9911c7eb79eb (patch) | |
| tree | c099e9880f7bf7d60e87dfa6a19cb4e8780ec860 /drivers/rtc/rtc-cmos.c | |
| parent | 6ae1e19dbb43ff0d429a9f45087c513212686836 (diff) | |
| parent | da97da73d418533187a8390cf6541f48bed653e8 (diff) | |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'drivers/rtc/rtc-cmos.c')
| -rw-r--r-- | drivers/rtc/rtc-cmos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 5856167a0c90..7e6ce626b7f1 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -687,7 +687,8 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) #if defined(CONFIG_ATARI) address_space = 64; #elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) \ - || defined(__sparc__) || defined(__mips__) + || defined(__sparc__) || defined(__mips__) \ + || defined(__powerpc__) address_space = 128; #else #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. |