diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
| commit | 846050dd49719b1f68248807bba5c27bfc86f81a (patch) | |
| tree | 79922936e8cde867ba90d753f79aa61f575e162b /drivers/net/lance.c | |
| parent | 49666145de54b5d6d256442bb1bec03ffae1ac76 (diff) | |
| parent | 2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/lance.c')
| -rw-r--r-- | drivers/net/lance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index c1c3452c90ca..5b4dbfe5fb77 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
| @@ -326,7 +326,7 @@ MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)"); | |||
| 326 | MODULE_PARM_DESC(irq, "LANCE/PCnet IRQ number (ignored for some devices)"); | 326 | MODULE_PARM_DESC(irq, "LANCE/PCnet IRQ number (ignored for some devices)"); |
| 327 | MODULE_PARM_DESC(lance_debug, "LANCE/PCnet debug level (0-7)"); | 327 | MODULE_PARM_DESC(lance_debug, "LANCE/PCnet debug level (0-7)"); |
| 328 | 328 | ||
| 329 | int init_module(void) | 329 | int __init init_module(void) |
| 330 | { | 330 | { |
| 331 | struct net_device *dev; | 331 | struct net_device *dev; |
| 332 | int this_dev, found = 0; | 332 | int this_dev, found = 0; |