summaryrefslogtreecommitdiff
path: root/drivers/net/seeq8005.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-30 01:55:59 +0400
committerJeff Garzik <jeff@garzik.org>2006-08-30 01:55:59 +0400
commitb01e86fee6c821e4e003fd4e9f65453ac478a58e (patch)
tree21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /drivers/net/seeq8005.c
parente889173c2c67dc288e9b050ab066cfae151b047e (diff)
parent60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff)
downloadlinux-b01e86fee6c821e4e003fd4e9f65453ac478a58e.tar.xz
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'drivers/net/seeq8005.c')
-rw-r--r--drivers/net/seeq8005.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c
index efd0f235020f..01392bca0223 100644
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/seeq8005.c
@@ -742,7 +742,7 @@ module_param(irq, int, 0);
MODULE_PARM_DESC(io, "SEEQ 8005 I/O base address");
MODULE_PARM_DESC(irq, "SEEQ 8005 IRQ number");
-int init_module(void)
+int __init init_module(void)
{
dev_seeq = seeq8005_probe(-1);
if (IS_ERR(dev_seeq))