summaryrefslogtreecommitdiff
path: root/drivers/rtc
diff options
context:
space:
mode:
authorkogiidena <kogiidena@eggplant.ddo.jp>2007-05-10 22:22:54 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 08:29:35 -0700
commit9a3f1d53dbf112d2387f8b80682afc1084f9dfc3 (patch)
tree1304b92c3ada981b7f832a18f919270c246cb7a7 /drivers/rtc
parent3e88c553db938ad016026375f0545304b9030b42 (diff)
downloadlinux-3.10-9a3f1d53dbf112d2387f8b80682afc1084f9dfc3.tar.gz
linux-3.10-9a3f1d53dbf112d2387f8b80682afc1084f9dfc3.tar.bz2
linux-3.10-9a3f1d53dbf112d2387f8b80682afc1084f9dfc3.zip
rtc-rs5c313.c: error and warning are fixed
Correct a compile error and warning. Signed-off-by: kogiidena <kogiidena@eggplant.ddo.jp> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/Kconfig2
-rw-r--r--drivers/rtc/rtc-rs5c313.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 1759baad439..ad445d5e58c 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -397,7 +397,7 @@ config RTC_DRV_BFIN
config RTC_DRV_RS5C313
tristate "Ricoh RS5C313"
- depends on RTC_CLASS && BROKEN
+ depends on RTC_CLASS && SH_LANDISK
help
If you say yes here you get support for the Ricoh RS5C313 RTC chips.
diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c
index 9d6de371495..79ee371dd75 100644
--- a/drivers/rtc/rtc-rs5c313.c
+++ b/drivers/rtc/rtc-rs5c313.c
@@ -126,7 +126,7 @@ static void rs5c313_write_data(unsigned char data)
static unsigned char rs5c313_read_data(void)
{
int i;
- unsigned char data;
+ unsigned char data = 0;
for (i = 0; i < 8; i++) {
ndelay(700);
@@ -194,7 +194,7 @@ static void rs5c313_write_reg(unsigned char addr, unsigned char data)
return;
}
-static inline unsigned char rs5c313_read_cntreg(unsigned char addr)
+static inline unsigned char rs5c313_read_cntreg(void)
{
return rs5c313_read_reg(RS5C313_ADDR_CNTREG);
}
@@ -356,7 +356,7 @@ static int rs5c313_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, rtc);
- return err;
+ return 0;
}
static int __devexit rs5c313_rtc_remove(struct platform_device *pdev)