diff --git a/[refs] b/[refs] index 4fea14c9baa1..51333ce99eed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e26c129a49a7a4990f362a9cdb3084198b4d9d7b +refs/heads/master: 5d930108c914c04fbb0bfbb059d23a5fcaf0d1e7 diff --git a/trunk/drivers/net/at1700.c b/trunk/drivers/net/at1700.c index 5d7929c79bce..4ca061c2d5b2 100644 --- a/trunk/drivers/net/at1700.c +++ b/trunk/drivers/net/at1700.c @@ -901,7 +901,7 @@ MODULE_PARM_DESC(io, "AT1700/FMV18X I/O base address"); MODULE_PARM_DESC(irq, "AT1700/FMV18X IRQ number"); MODULE_PARM_DESC(net_debug, "AT1700/FMV18X debug level (0-6)"); -int init_module(void) +int __init init_module(void) { if (io == 0) printk("at1700: You should not use auto-probing with insmod!\n");