diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 12:23:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 12:23:07 -0800 |
| commit | e67b23c71cb9ee02d65a74c3858716ba2dedd554 (patch) | |
| tree | 17cfeadd37b93ca758aa3ffb61e02edf62289aea /drivers/net/ioc3-eth.c | |
| parent | d4bf205305a9188894ac4e2e9875e42f9f8eabfd (diff) | |
| parent | f7492f17f2123f0f4db5f9e8ba89867a7b352658 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ioc3-eth.c')
| -rw-r--r-- | drivers/net/ioc3-eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index 6a3129bc15a6..9b8295ee06ef 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c @@ -1360,7 +1360,7 @@ static struct pci_driver ioc3_driver = { static int __init ioc3_init_module(void) { - return pci_module_init(&ioc3_driver); + return pci_register_driver(&ioc3_driver); } static void __exit ioc3_cleanup_module(void) |