diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 20:07:36 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 20:07:36 -0500 |
| commit | 54da9a3968448681d0ddf193ec90f2480c5cba1c (patch) | |
| tree | 69fdbaf8fb9cc61629e191b158a51073bd0c83fb /drivers/net/de620.c | |
| parent | 46e202ec1feeac3cb722cd3410d62a9a00891388 (diff) | |
| parent | 2f7ccc51db9f10ed2eaa4cd1777181972a23754e (diff) | |
| download | talos-obmc-linux-54da9a3968448681d0ddf193ec90f2480c5cba1c.tar.gz talos-obmc-linux-54da9a3968448681d0ddf193ec90f2480c5cba1c.zip | |
Merge branch 'upstream'
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) #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)) |
