2005-09-08 01:32:26

by Chris Wright

[permalink] [raw]
Subject: [PATCH 7/9] [RTC]: Use SA_SHIRQ in sparc specific code.

-stable review patch. If anyone has any objections, please let us know.
------------------

Based upon a report from Jason Wever.

Signed-off-by: "David S. Miller" <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
drivers/char/rtc.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)

Index: linux-2.6.13.y/drivers/char/rtc.c
===================================================================
--- linux-2.6.13.y.orig/drivers/char/rtc.c
+++ linux-2.6.13.y/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.

--