--- arch/i386/kernel/irq.c.orig	2004-01-01 10:06:00.000000000 +0100
+++ arch/i386/kernel/irq.c	2003-12-31 13:13:58.000000000 +0100
@@ -511,19 +511,6 @@
 	return 1;
 }
 
-int can_request_irq(unsigned int irq, unsigned long irqflags)
-{
-	struct irqaction *action;
-
-	if (irq >= NR_IRQS)
-		return 0;
-	action = irq_desc[irq].action;
-	if (action) {
-		if (irqflags & action->flags & SA_SHIRQ)
-			action = NULL;
-	}
-	return !action;
-}
 
 /**
  *	request_irq - allocate an interrupt line
--- arch/i386/pci/irq.c.orig	2004-01-01 10:06:42.000000000 +0100
+++ arch/i386/pci/irq.c	2003-12-31 13:24:35.000000000 +0100
@@ -939,6 +939,20 @@
 	pirq_penalty[irq] += 100;
 }
 
+int can_request_irq(unsigned int irq, unsigned long irqflags)
+{
+       struct irqaction *action;
+
+       if (irq >= NR_IRQS)
+               return 0;
+       action = irq_desc[irq].action;
+       if (action) {
+               if (irqflags & action->flags & SA_SHIRQ)
+                       action = NULL;
+       }
+       return !action;
+}
+
 int pirq_enable_irq(struct pci_dev *dev)
 {
 	u8 pin;