summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSrikanth Krishnakar <skrishna@mvista.com>2010-10-14 06:03:35 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-11-29 05:48:19 +0100
commit8cb7c71bda16e2d67a332642661e0b4219641a23 (patch)
tree826470768fd5ac810fd3b915532b3cb50da0abed /drivers
parentpowerpc: Add support for new hcall H_BEST_ENERGY (diff)
downloadlinux-8cb7c71bda16e2d67a332642661e0b4219641a23.tar.xz
linux-8cb7c71bda16e2d67a332642661e0b4219641a23.zip
rtc-cmos.c : Fix warning on PowerPC
The following warning is seen while compilation of PowerPC kernel: CC drivers/rtc/rtc-cmos.o drivers/rtc/rtc-cmos.c:697:2: warning: #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. Fix it by adding defined(__powerpc__). Signed-off-by: Srikanth Krishnakar <skrishna@mvista.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rtc/rtc-cmos.c3
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.