projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...
[deliverable/linux.git]
/
drivers
/
rtc
/
rtc-mrst.c
diff --git
a/drivers/rtc/rtc-mrst.c
b/drivers/rtc/rtc-mrst.c
index 548ea6f6f384b27f78e51b545116948d4c8cc652..0094d9bdd1e6a7fba10530f57582ecd6cd026352 100644
(file)
--- a/
drivers/rtc/rtc-mrst.c
+++ b/
drivers/rtc/rtc-mrst.c
@@
-266,7
+266,7
@@
static int mrst_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
}
-#if
defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE
)
+#if
IS_ENABLED(CONFIG_RTC_INTF_PROC
)
static int mrst_procfs(struct device *dev, struct seq_file *seq)
{
This page took
0.024679 seconds
and
5
git commands to generate.