diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 09:29:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 09:29:52 +0200 |
| commit | 7bdb2b6aca356c765bb697a4e9e7599357ee1542 (patch) | |
| tree | 63557166f8f85ba7751b5c9ebf83930ac943bafe /drivers/char/rtc.c | |
| parent | [IEEE80211]: Use correct size_t printf format string in ieee80211_rx.c (diff) | |
| parent | [SPARC64]: Kconfig fix (GEN_RTC dependencies) (diff) | |
| download | linux-7bdb2b6aca356c765bb697a4e9e7599357ee1542.tar.xz linux-7bdb2b6aca356c765bb697a4e9e7599357ee1542.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/char/rtc.c')
| -rw-r--r-- | drivers/char/rtc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index cd4fe8b1709f..63fff7c1244a 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -938,10 +938,9 @@ found: /* * XXX Interrupt pin #7 in Espresso is shared between RTC and - * PCI Slot 2 INTA# (and some INTx# in Slot 1). SA_INTERRUPT here - * is asking for trouble with add-on boards. Change to SA_SHIRQ. + * PCI Slot 2 INTA# (and some INTx# in Slot 1). */ - if (request_irq(rtc_irq, rtc_interrupt, SA_INTERRUPT, "rtc", (void *)&rtc_port)) { + if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) { /* * Standard way for sparc to print irq's is to use * __irq_itoa(). I think for EBus it's ok to use %d. |