---

yaml --- r: 7133 b: refs/heads/master c: 53d0fc2 h: refs/heads/master i: 7131: a65e1a8 v: v3
git-mirror · Sep 6, 2005 · 2bf98c3 · 2bf98c3
1 parent 49aedfb
commit 2bf98c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d25240fcfce0e55540a273b1e1b07d304065a31
+refs/heads/master: 53d0fc27af3a3ab22c0ffb67857adfa18977e681
diff --git a/trunk/drivers/char/rtc.c b/trunk/drivers/char/rtc.c
@@ -938,10 +938,9 @@ static int __init rtc_init(void)
 
 	/*
 	 * 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.