mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
This commit is contained in:
commit
977127174a
68 changed files with 954 additions and 442 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue