Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / drivers / net / es3210.c

diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index 6b0ab1eac3fb6179ddeafacb8a05ae8265be94bb..fd7b32a24ea4f33d9cf1461daff5433b2fcc5a36 100644 (file)
--- 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;