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

This commit is contained in:
Linus Torvalds 2006-01-09 18:41:42 -08:00
commit 977127174a
68 changed files with 954 additions and 442 deletions

View file

@ -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;