diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:41:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:41:42 -0800 |
| commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
| tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /drivers/serial | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_txx9.c | 2 |
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; |