aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/de620.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-03-20 10:53:56 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-03-20 10:53:56 -0600
commit61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch)
tree2cf21d235f17e80d47fdb4ee1248865be8196d4d /drivers/net/de620.c
parent9585da3729e7e27bf22818625c10ac6c64ebb609 (diff)
parent2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff)
downloadkernel_samsung_smdk4412-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.gz
kernel_samsung_smdk4412-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.bz2
kernel_samsung_smdk4412-61c5504a0ed66c8b460f9a006eedaea2ee587e33.zip
Merge branch 'master'
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 0069f5fa973..22fc5b869a6 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))