summaryrefslogtreecommitdiff
path: root/drivers/net/e2100.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-20 01:45:11 +0400
committerJeff Garzik <jeff@garzik.org>2006-08-20 01:45:11 +0400
commit846050dd49719b1f68248807bba5c27bfc86f81a (patch)
tree79922936e8cde867ba90d753f79aa61f575e162b /drivers/net/e2100.c
parent49666145de54b5d6d256442bb1bec03ffae1ac76 (diff)
parent2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff)
downloadlinux-846050dd49719b1f68248807bba5c27bfc86f81a.tar.xz
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/e2100.c')
-rw-r--r--drivers/net/e2100.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index e5c5cd2a2712..e4e733a380e3 100644
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -425,8 +425,8 @@ MODULE_LICENSE("GPL");
/* This is set up so that only a single autoprobe takes place per call.
ISA device autoprobes on a running machine are not recommended. */
-int
-init_module(void)
+
+int __init init_module(void)
{
struct net_device *dev;
int this_dev, found = 0;