diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /drivers/net/appletalk/cops.c | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'drivers/net/appletalk/cops.c')
| -rw-r--r-- | drivers/net/appletalk/cops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 1d01ac0000e4..ae7f828344d9 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
| @@ -1030,7 +1030,7 @@ module_param(io, int, 0); | |||
| 1030 | module_param(irq, int, 0); | 1030 | module_param(irq, int, 0); |
| 1031 | module_param(board_type, int, 0); | 1031 | module_param(board_type, int, 0); |
| 1032 | 1032 | ||
| 1033 | int init_module(void) | 1033 | int __init init_module(void) |
| 1034 | { | 1034 | { |
| 1035 | if (io == 0) | 1035 | if (io == 0) |
| 1036 | printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n", | 1036 | printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n", |