diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 11:53:56 -0500 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /drivers/net/de620.c | |
| parent | 9585da3729e7e27bf22818625c10ac6c64ebb609 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/de620.c')
| -rw-r--r-- | drivers/net/de620.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c index 0069f5fa973a..22fc5b869a60 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c | |||
| @@ -1012,7 +1012,7 @@ static int __init read_eeprom(struct net_device *dev) | |||
| 1012 | #ifdef MODULE | 1012 | #ifdef MODULE |
| 1013 | static struct net_device *de620_dev; | 1013 | static struct net_device *de620_dev; |
| 1014 | 1014 | ||
| 1015 | int init_module(void) | 1015 | int __init init_module(void) |
| 1016 | { | 1016 | { |
| 1017 | de620_dev = de620_probe(-1); | 1017 | de620_dev = de620_probe(-1); |
| 1018 | if (IS_ERR(de620_dev)) | 1018 | if (IS_ERR(de620_dev)) |