summaryrefslogtreecommitdiffstats
path: root/drivers/net/de620.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-14 14:18:01 -0600
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-14 14:18:01 -0600
commitf33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch)
treeb027b5f3429d416b3da5b9195024007dab062a5e /drivers/net/de620.c
parente935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff)
parent67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff)
downloadlinux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.tar.gz
linux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.tar.bz2
linux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.zip
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/de620.c')
-rw-r--r--drivers/net/de620.c2
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))