r1157 - trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches

[Thiemo Seufer]

Author: ths-guest
Date: 2004-08-16 11:14:31 -0600 (Mon, 16 Aug 2004)
New Revision: 1157

Modified:
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00_linux-mips.dpatch
Log:
Fix the fix.


Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00_linux-mips.dpatch
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00_linux-mips.dpatch	2004-08-16 17:07:21 UTC (rev 1156)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00_linux-mips.dpatch	2004-08-16 17:14:31 UTC (rev 1157)
@@ -29059,9 +29059,9 @@
      }
  
 +#ifdef CONFIG_LASAT
-+    if (dev->irq >= 0)
++    if (dev->irq >= 0) {
 +#else
-     if (dev->irq >= 2)
+     if (dev->irq >= 2) {
 +#endif
  	if (pcnet32_debug & NETIF_MSG_PROBE)
  	    printk(" assigned IRQ %d.\n", dev->irq);
@@ -29070,10 +29070,10 @@
      int rc;
      unsigned long flags;
  
--     if (dev->irq == 0 ||
-+     if (
+-    if (dev->irq == 0 ||
++    if (
 +#ifndef CONFIG_LASAT
-+         dev->irq == 0 ||
++	dev->irq == 0 ||
 +#endif
  	request_irq(dev->irq, &pcnet32_interrupt,
  		    lp->shared_irq ? SA_SHIRQ : 0, dev->name, (void *)dev)) {