diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-23 21:58:48 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-23 21:58:48 -0700 |
commit | 20253de9d566f02b82aa1e0c103f73e80619106a (patch) | |
tree | a91db957a3dd40469531f35a920b8302c03fb7ee /drivers/net/at1700.c | |
parent | b7277155f8fa89cd5696140b4a93cfb53d0091ff (diff) | |
parent | 357eb4cf75fdb9dbe46b64d50f3670de6a45dc91 (diff) |
Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/at1700.c')
-rw-r--r-- | drivers/net/at1700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 5d7929c79bc..4ca061c2d5b 100644 --- a/drivers/net/at1700.c +++ b/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"); |