diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:29:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:29:52 -0400 |
| commit | 7bdb2b6aca356c765bb697a4e9e7599357ee1542 (patch) | |
| tree | 63557166f8f85ba7751b5c9ebf83930ac943bafe /drivers/char/rtc.c | |
| parent | 4c2cac8908ded8436191bd058e52d2737fd7fd31 (diff) | |
| parent | c0f2f761e1ea3923952e31cce2cdb7d65f450fbd (diff) | |
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: | |||
| 938 | 938 | ||
| 939 | /* | 939 | /* |
| 940 | * XXX Interrupt pin #7 in Espresso is shared between RTC and | 940 | * XXX Interrupt pin #7 in Espresso is shared between RTC and |
| 941 | * PCI Slot 2 INTA# (and some INTx# in Slot 1). SA_INTERRUPT here | 941 | * PCI Slot 2 INTA# (and some INTx# in Slot 1). |
| 942 | * is asking for trouble with add-on boards. Change to SA_SHIRQ. | ||
| 943 | */ | 942 | */ |
| 944 | if (request_irq(rtc_irq, rtc_interrupt, SA_INTERRUPT, "rtc", (void *)&rtc_port)) { | 943 | if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) { |
| 945 | /* | 944 | /* |
| 946 | * Standard way for sparc to print irq's is to use | 945 | * Standard way for sparc to print irq's is to use |
| 947 | * __irq_itoa(). I think for EBus it's ok to use %d. | 946 | * __irq_itoa(). I think for EBus it's ok to use %d. |