| 1 |
From stable-bounces@linux.kernel.org Tue Sep 6 15:03:44 2005
|
| 2 |
Date: Tue, 06 Sep 2005 15:03:39 -0700 (PDT)
|
| 3 |
To: stable@kernel.org
|
| 4 |
From: "David S. Miller" <davem@davemloft.net>
|
| 5 |
Subject: [RTC]: Use SA_SHIRQ in sparc specific code.
|
| 6 |
|
| 7 |
Based upon a report from Jason Wever.
|
| 8 |
|
| 9 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
| 10 |
Signed-off-by: Chris Wright <chrisw@osdl.org>
|
| 11 |
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
| 12 |
---
|
| 13 |
drivers/char/rtc.c | 5 ++---
|
| 14 |
1 files changed, 2 insertions(+), 3 deletions(-)
|
| 15 |
|
| 16 |
Index: linux-2.6.13.y/drivers/char/rtc.c
|
| 17 |
===================================================================
|
| 18 |
--- linux-2.6.13.y.orig/drivers/char/rtc.c
|
| 19 |
+++ linux-2.6.13.y/drivers/char/rtc.c
|
| 20 |
@@ -938,10 +938,9 @@ found:
|
| 21 |
|
| 22 |
/*
|
| 23 |
* XXX Interrupt pin #7 in Espresso is shared between RTC and
|
| 24 |
- * PCI Slot 2 INTA# (and some INTx# in Slot 1). SA_INTERRUPT here
|
| 25 |
- * is asking for trouble with add-on boards. Change to SA_SHIRQ.
|
| 26 |
+ * PCI Slot 2 INTA# (and some INTx# in Slot 1).
|
| 27 |
*/
|
| 28 |
- if (request_irq(rtc_irq, rtc_interrupt, SA_INTERRUPT, "rtc", (void *)&rtc_port)) {
|
| 29 |
+ if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) {
|
| 30 |
/*
|
| 31 |
* Standard way for sparc to print irq's is to use
|
| 32 |
* __irq_itoa(). I think for EBus it's ok to use %d.
|