projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-general' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris...
[linux-2.6-microblaze.git]
/
drivers
/
mfd
/
menelaus.c
diff --git
a/drivers/mfd/menelaus.c
b/drivers/mfd/menelaus.c
index
5c77787
..
b64d331
100644
(file)
--- a/
drivers/mfd/menelaus.c
+++ b/
drivers/mfd/menelaus.c
@@
-1125,8
+1125,6
@@
static inline void menelaus_rtc_init(struct menelaus_chip *m)
menelaus_remove_irq_work(MENELAUS_RTCALM_IRQ);
device_init_wakeup(&m->client->dev, 0);
}
- dev_err(&m->client->dev, "can't register RTC: %d\n",
- (int) PTR_ERR(m->rtc));
the_menelaus->rtc = NULL;
}
}