Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index f10c86d60b64..995d9dd9ddd5 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -1195,7 +1195,7 @@ static int __init serial_txx9_init(void)
                 serial_txx9_register_ports(&serial_txx9_reg);
 
 #ifdef ENABLE_SERIAL_TXX9_PCI
-                ret = pci_module_init(&serial_txx9_pci_driver);
+                ret = pci_register_driver(&serial_txx9_pci_driver);
 #endif
         }
         return ret;