diff options
author | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
commit | ebe8912be214662c8289977fb416c1f015df4a0b (patch) | |
tree | cb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /drivers/net/appletalk/ltpc.c | |
parent | 50531444fac593c8c8e3ff2e41944d9507bb4665 (diff) | |
parent | dba92d3bc49c036056a48661d2d8fefe4c78375a (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/appletalk/ltpc.c')
-rw-r--r-- | drivers/net/appletalk/ltpc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index 6ab2c2d4d673..fef5560bc7a2 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
@@ -1252,7 +1252,7 @@ module_param(irq, int, 0); | |||
1252 | module_param(dma, int, 0); | 1252 | module_param(dma, int, 0); |
1253 | 1253 | ||
1254 | 1254 | ||
1255 | int __init init_module(void) | 1255 | static int __init ltpc_module_init(void) |
1256 | { | 1256 | { |
1257 | if(io == 0) | 1257 | if(io == 0) |
1258 | printk(KERN_NOTICE | 1258 | printk(KERN_NOTICE |
@@ -1263,6 +1263,7 @@ int __init init_module(void) | |||
1263 | return PTR_ERR(dev_ltpc); | 1263 | return PTR_ERR(dev_ltpc); |
1264 | return 0; | 1264 | return 0; |
1265 | } | 1265 | } |
1266 | module_init(ltpc_module_init); | ||
1266 | #endif | 1267 | #endif |
1267 | 1268 | ||
1268 | static void __exit ltpc_cleanup(void) | 1269 | static void __exit ltpc_cleanup(void) |