diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-06-23 06:11:56 +0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-06-23 06:11:56 +0400 |
commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
tree | e786da7145d83c19a594adf76ed90d52c51058b1 /drivers/net/3c501.c | |
parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
download | linux-71d530cd1b6d97094481002a04c77fea1c8e1c22.tar.xz |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'drivers/net/3c501.c')
-rw-r--r-- | drivers/net/3c501.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c index f6d51ce34b00..bb44509fd404 100644 --- a/drivers/net/3c501.c +++ b/drivers/net/3c501.c @@ -909,7 +909,7 @@ MODULE_PARM_DESC(irq, "EtherLink IRQ number"); * here also causes the module to be unloaded */ -int init_module(void) +int __init init_module(void) { dev_3c501 = el1_probe(-1); if (IS_ERR(dev_3c501)) |