diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 00:56:23 -0400 |
| commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
| tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /drivers/net/3c505.c | |
| parent | d8ce75324135ea7100124c1fff4ec5090a350607 (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'drivers/net/3c505.c')
| -rw-r--r-- | drivers/net/3c505.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index 111601ca4ca3..19c0b856c488 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
| @@ -1633,7 +1633,7 @@ MODULE_PARM_DESC(io, "EtherLink Plus I/O base address(es)"); | |||
| 1633 | MODULE_PARM_DESC(irq, "EtherLink Plus IRQ number(s) (assigned)"); | 1633 | MODULE_PARM_DESC(irq, "EtherLink Plus IRQ number(s) (assigned)"); |
| 1634 | MODULE_PARM_DESC(dma, "EtherLink Plus DMA channel(s)"); | 1634 | MODULE_PARM_DESC(dma, "EtherLink Plus DMA channel(s)"); |
| 1635 | 1635 | ||
| 1636 | int init_module(void) | 1636 | int __init init_module(void) |
| 1637 | { | 1637 | { |
| 1638 | int this_dev, found = 0; | 1638 | int this_dev, found = 0; |
| 1639 | 1639 | ||