aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-23 11:02:41 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-23 11:02:41 -0800
commitfe6ea1f7e5c2d3947bf62f2a219e69718ca0b187 (patch)
tree7c6efcc79f7b12f28315a61e10c9a984fd787043 /drivers/net/netxen/netxen_nic_main.c
parent6d7de67c5e4f2e9cdcf9b0a096380846e6a8278b (diff)
parent184231bdb41fc4c385ae8e115f5afaff02fe1690 (diff)
downloadmrst-s0i3-test-fe6ea1f7e5c2d3947bf62f2a219e69718ca0b187.tar.gz
mrst-s0i3-test-fe6ea1f7e5c2d3947bf62f2a219e69718ca0b187.tar.xz
mrst-s0i3-test-fe6ea1f7e5c2d3947bf62f2a219e69718ca0b187.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: NetXen: Use pci_register_driver() instead of pci_module_init() in init_module NetXen: Firmware check modifications ehea: Fixed possible nullpointer access ehea: Added logging off associated errors ehea: Improved logging of permission issues ehea: New method to determine number of available ports ehea: Modified initial autoneg state determination ehea: Fixing firmware queue config issue ehea: Fixed wrong dereferencation PHY: Export phy ethtool helpers modify 3c589_cs to be SMP safe
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 8a5792fea77..96e1bee19ba 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1144,7 +1144,7 @@ static int __init netxen_init_module(void)
if ((netxen_workq = create_singlethread_workqueue("netxen")) == 0)
return -ENOMEM;
- return pci_module_init(&netxen_driver);
+ return pci_register_driver(&netxen_driver);
}
module_init(netxen_init_module);