diff --git a/[refs] b/[refs] index 51333ce99eed..71ae7d646591 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d930108c914c04fbb0bfbb059d23a5fcaf0d1e7 +refs/heads/master: d543cbb6d192313d9027ed09c7a1e085b1234082 diff --git a/trunk/drivers/net/e2100.c b/trunk/drivers/net/e2100.c index e5c5cd2a2712..e4e733a380e3 100644 --- a/trunk/drivers/net/e2100.c +++ b/trunk/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;