diff options
author | Tom Rini <trini@konsulko.com> | 2015-10-21 20:47:40 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-10-21 20:47:40 -0400 |
commit | 858dbdf8412cefb6dbc4eed63dc3de9744578455 (patch) | |
tree | 7cca9f60b3d677b338defa3f4af74a1fff017071 /drivers/rtc/mc146818.c | |
parent | 89b5c81b75658b7ff66dea6c38a51dfecc9dd508 (diff) | |
parent | e0ae64880b61fdeaf261fddd747efa80fa53d386 (diff) |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/rtc/mc146818.c')
-rw-r--r-- | drivers/rtc/mc146818.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c index 363ade33e3..da804d5459 100644 --- a/drivers/rtc/mc146818.c +++ b/drivers/rtc/mc146818.c @@ -192,7 +192,7 @@ static void mc146818_init(void) /* Clear any pending interrupts */ mc146818_read8(RTC_CONFIG_C); } -#endif +#endif /* CONFIG_CMD_DATE */ #ifdef CONFIG_DM_RTC @@ -225,7 +225,7 @@ static int rtc_mc146818_write8(struct udevice *dev, unsigned int reg, int val) return 0; } -static int rtc_mc146818_bind(struct udevice *dev) +static int rtc_mc146818_probe(struct udevice *dev) { mc146818_init(); @@ -249,7 +249,7 @@ U_BOOT_DRIVER(rtc_mc146818) = { .name = "rtc_mc146818", .id = UCLASS_RTC, .of_match = rtc_mc146818_ids, - .bind = rtc_mc146818_bind, + .probe = rtc_mc146818_probe, .ops = &rtc_mc146818_ops, }; |