summaryrefslogtreecommitdiffstats
path: root/drivers/net/es3210.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-23 21:58:48 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-23 21:58:48 -0700
commit20253de9d566f02b82aa1e0c103f73e80619106a (patch)
treea91db957a3dd40469531f35a920b8302c03fb7ee /drivers/net/es3210.c
parentb7277155f8fa89cd5696140b4a93cfb53d0091ff (diff)
parent357eb4cf75fdb9dbe46b64d50f3670de6a45dc91 (diff)
downloadkernel-crypto-20253de9d566f02b82aa1e0c103f73e80619106a.tar.gz
kernel-crypto-20253de9d566f02b82aa1e0c103f73e80619106a.tar.xz
kernel-crypto-20253de9d566f02b82aa1e0c103f73e80619106a.zip
Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/es3210.c')
-rw-r--r--drivers/net/es3210.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 6b0ab1eac3f..fd7b32a24ea 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -421,8 +421,7 @@ MODULE_PARM_DESC(mem, "memory base address(es)");
MODULE_DESCRIPTION("Racal-Interlan ES3210 EISA ethernet driver");
MODULE_LICENSE("GPL");
-int
-init_module(void)
+int __init init_module(void)
{
struct net_device *dev;
int this_dev, found = 0;