diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /drivers/net/eexpress.c | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'drivers/net/eexpress.c')
| -rw-r--r-- | drivers/net/eexpress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 33291bcf6d4c..0701c1d810ca 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
| @@ -1698,7 +1698,7 @@ MODULE_LICENSE("GPL"); | |||
| 1698 | * are specified, we verify and then use them. If no parameters are given, we | 1698 | * are specified, we verify and then use them. If no parameters are given, we |
| 1699 | * autoprobe for one card only. | 1699 | * autoprobe for one card only. |
| 1700 | */ | 1700 | */ |
| 1701 | int init_module(void) | 1701 | int __init init_module(void) |
| 1702 | { | 1702 | { |
| 1703 | struct net_device *dev; | 1703 | struct net_device *dev; |
| 1704 | int this_dev, found = 0; | 1704 | int this_dev, found = 0; |