diff options
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-rs5c313.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 1759baad439c..ad445d5e58c7 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -397,7 +397,7 @@ config RTC_DRV_BFIN | |||
397 | 397 | ||
398 | config RTC_DRV_RS5C313 | 398 | config RTC_DRV_RS5C313 |
399 | tristate "Ricoh RS5C313" | 399 | tristate "Ricoh RS5C313" |
400 | depends on RTC_CLASS && BROKEN | 400 | depends on RTC_CLASS && SH_LANDISK |
401 | help | 401 | help |
402 | If you say yes here you get support for the Ricoh RS5C313 RTC chips. | 402 | If you say yes here you get support for the Ricoh RS5C313 RTC chips. |
403 | 403 | ||
diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c index 9d6de371495b..79ee371dd75b 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) | |||
126 | static unsigned char rs5c313_read_data(void) | 126 | static unsigned char rs5c313_read_data(void) |
127 | { | 127 | { |
128 | int i; | 128 | int i; |
129 | unsigned char data; | 129 | unsigned char data = 0; |
130 | 130 | ||
131 | for (i = 0; i < 8; i++) { | 131 | for (i = 0; i < 8; i++) { |
132 | ndelay(700); | 132 | ndelay(700); |
@@ -194,7 +194,7 @@ static void rs5c313_write_reg(unsigned char addr, unsigned char data) | |||
194 | return; | 194 | return; |
195 | } | 195 | } |
196 | 196 | ||
197 | static inline unsigned char rs5c313_read_cntreg(unsigned char addr) | 197 | static inline unsigned char rs5c313_read_cntreg(void) |
198 | { | 198 | { |
199 | return rs5c313_read_reg(RS5C313_ADDR_CNTREG); | 199 | return rs5c313_read_reg(RS5C313_ADDR_CNTREG); |
200 | } | 200 | } |
@@ -356,7 +356,7 @@ static int rs5c313_rtc_probe(struct platform_device *pdev) | |||
356 | 356 | ||
357 | platform_set_drvdata(pdev, rtc); | 357 | platform_set_drvdata(pdev, rtc); |
358 | 358 | ||
359 | return err; | 359 | return 0; |
360 | } | 360 | } |
361 | 361 | ||
362 | static int __devexit rs5c313_rtc_remove(struct platform_device *pdev) | 362 | static int __devexit rs5c313_rtc_remove(struct platform_device *pdev) |