diff --git a/[refs] b/[refs] index e5fb1204bd4f..f9d6929ee200 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27d2ab54bdfaffdbdc1a81100dc53c6479c9db35 +refs/heads/master: 7e3e8b05a90bcc5799b0d4525f23c80d661d0194 diff --git a/trunk/drivers/net/hp100.c b/trunk/drivers/net/hp100.c index 844c136e9920..7dc5185aa2c0 100644 --- a/trunk/drivers/net/hp100.c +++ b/trunk/drivers/net/hp100.c @@ -3034,7 +3034,7 @@ static int __init hp100_module_init(void) goto out2; #endif #ifdef CONFIG_PCI - err = pci_module_init(&hp100_pci_driver); + err = pci_register_driver(&hp100_pci_driver); if (err && err != -ENODEV) goto out3; #endif