r1154 - in 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 10:50:33 -0600 (Mon, 16 Aug 2004)
New Revision: 1154

Modified:
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
   trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00_linux-mips.dpatch
Log:
pcnet32 fix for r5k-lasat.


Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control	2004-08-16 15:50:22 UTC (rev 1153)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control	2004-08-16 16:50:33 UTC (rev 1154)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Kernel Maintainers <debian-kernel@lists.debian.org>
 Uploaders: Guido Guenther <agx@debian.org>, Karsten Merker <merker@debian.org>, Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
-Build-Depends: kernel-source-2.4.27 (>=2.4.27-1), kernel-package, debhelper (>=4.1.0), modutils, console-tools, dpatch
+Build-Depends: kernel-source-2.4.27 (>=2.4.27-1), kernel-package, debhelper (>=4.1.0), modutils, console-tools, dpatch, bzip2
 Standards-Version: 3.6.1
 
 Package: kernel-headers-2.4.27

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 15:50:22 UTC (rev 1153)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/patches/00_linux-mips.dpatch	2004-08-16 16:50:33 UTC (rev 1154)
@@ -29061,17 +29061,19 @@
 +#ifdef CONFIG_LASAT
 +    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);
      } else {
-@@ -1361,7 +1365,9 @@ pcnet32_open(struct net_device *dev)
+@@ -1361,7 +1365,10 @@ pcnet32_open(struct net_device *dev)
      int rc;
      unsigned long flags;
  
+-     if (dev->irq == 0 ||
++     if (
 +#ifndef CONFIG_LASAT
-     if (dev->irq == 0 ||
++         dev->irq == 0 ||
 +#endif
  	request_irq(dev->irq, &pcnet32_interrupt,
  		    lp->shared_irq ? SA_SHIRQ : 0, dev->name, (void *)dev)) {