diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:55:26 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:55:26 -0500 |
commit | ed071adc97a69785686a37fb88e100f41b482b94 (patch) | |
tree | 75be27a48365aab9cfe6531f7d1f5516e6602307 /drivers/net/de620.c | |
parent | 6971ed1fbbc80cae54e082aae153d5b063885d0a (diff) | |
parent | 535744878e34d01a53f946f26dfbca37186f2cf8 (diff) | |
download | op-kernel-dev-ed071adc97a69785686a37fb88e100f41b482b94.zip op-kernel-dev-ed071adc97a69785686a37fb88e100f41b482b94.tar.gz |
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 0069f5f..22fc5b8 100644 --- a/drivers/net/de620.c +++ b/drivers/net/de620.c @@ -1012,7 +1012,7 @@ static int __init read_eeprom(struct net_device *dev) #ifdef MODULE static struct net_device *de620_dev; -int init_module(void) +int __init init_module(void) { de620_dev = de620_probe(-1); if (IS_ERR(de620_dev)) |