Hello,
On Mon, Mar 27, 2000 at 11:35:26PM +0100, James Fidell wrote:
> Quoting Andrey Savochkin (saw@saw.sw.com.sg):
>
> > I've prepared eepro100 driver update for 2.3/4 kernels.
>
> This:
>
> > +#ifdef MODULE
> > +static int debug = -1; /* The debug level */
> > +#endif
This piece has accidently slipped my eyes when I did the port.
The fix follows.
Best regards
Andrey V.
Savochkin
diff -u -r1.27 -r1.28
--- drivers/net/eepro100.c 2000/03/27 12:37:59
+++ drivers/net/eepro100.c 2000/03/28 03:32:57
@@ -38,7 +38,7 @@
static const char *version =
"eepro100.c:v1.09j-t 9/29/99 Donald Becker http://cesdis.gsfc.nasa.gov/linux/drivers/eepro100.html\n"
-"eepro100.c: $Revision: 1.27 $ 2000/03/27 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n";
+"eepro100.c: $Revision: 1.28 $ 2000/03/28 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n";
/* A few user-configurable values that apply to all boards.
First set is undocumented and spelled per Intel recommendations. */
@@ -64,9 +64,7 @@
e.g. "options=16" for FD, "options=32" for 100mbps-only. */
static int full_duplex[] = {-1, -1, -1, -1, -1, -1, -1, -1};
static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1};
-#ifdef MODULE
static int debug = -1; /* The debug level */
-#endif
/* A few values that may be tweaked. */
/* The ring sizes should be a power of two for efficiency. */
@@ -659,11 +657,11 @@
return 0;
-err_out_iounmap:
+err_out_iounmap: ;
#ifndef USE_IO
iounmap ((void *)ioaddr);
-err_out_free_mmio_region:
#endif
+err_out_free_mmio_region:
release_mem_region(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));
err_out_free_pio_region:
release_region(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1));
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Mar 31 2000 - 21:00:21 EST