diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-29 22:17:25 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 22:17:25 +0200 |
| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 (patch) | |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc /drivers/net/seeq8005.c | |
| parent | Merge branch 'upstream-fixes' into upstream (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| download | linux-e4ac2663ea27d5dda88d97d117080995fcfcd6d5.tar.xz linux-e4ac2663ea27d5dda88d97d117080995fcfcd6d5.zip | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/net/seeq8005.c')
| -rw-r--r-- | drivers/net/seeq8005.c | 2 |
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)) |