summaryrefslogtreecommitdiffstats
path: root/drivers/net/3c523.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-06-20 20:36:38 +0000
committerSteve French <sfrench@us.ibm.com>2006-06-20 20:36:38 +0000
commit75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch)
treec2f02ee30609d0d69308b4ca80d68d02a5f85552 /drivers/net/3c523.c
parent0fd1ffe0633b4b039b343b753598e6df435e034d (diff)
parent25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff)
downloadkernel-crypto-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.tar.gz
kernel-crypto-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.tar.xz
kernel-crypto-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/3c523.c')
-rw-r--r--drivers/net/3c523.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index b40885d4168..4bf8510655c 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -1277,7 +1277,7 @@ MODULE_PARM_DESC(io, "EtherLink/MC I/O base address(es)");
MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)");
MODULE_LICENSE("GPL");
-int init_module(void)
+int __init init_module(void)
{
int this_dev,found = 0;