diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-23 17:13:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-23 17:13:56 -0500 |
| commit | abb434cb0539fb355c1c921f8fd761efbbac3462 (patch) | |
| tree | 24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6 /drivers/rtc/rtc-m41t80.c | |
| parent | 2494654d4890316e7340fb8b3458daad0474a1b9 (diff) | |
| parent | 6350323ad8def2ac00d77cdee3b79c9b9fba75c4 (diff) | |
| download | op-kernel-dev-abb434cb0539fb355c1c921f8fd761efbbac3462.zip op-kernel-dev-abb434cb0539fb355c1c921f8fd761efbbac3462.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/bluetooth/l2cap_core.c
Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/rtc/rtc-m41t80.c')
| -rw-r--r-- | drivers/rtc/rtc-m41t80.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c index eda128f..64aedd8 100644 --- a/drivers/rtc/rtc-m41t80.c +++ b/drivers/rtc/rtc-m41t80.c @@ -357,10 +357,19 @@ static int m41t80_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *t) static struct rtc_class_ops m41t80_rtc_ops = { .read_time = m41t80_rtc_read_time, .set_time = m41t80_rtc_set_time, + /* + * XXX - m41t80 alarm functionality is reported broken. + * until it is fixed, don't register alarm functions. + * .read_alarm = m41t80_rtc_read_alarm, .set_alarm = m41t80_rtc_set_alarm, + */ .proc = m41t80_rtc_proc, + /* + * See above comment on broken alarm + * .alarm_irq_enable = m41t80_rtc_alarm_irq_enable, + */ }; #if defined(CONFIG_RTC_INTF_SYSFS) || defined(CONFIG_RTC_INTF_SYSFS_MODULE) |
