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

2006-01-09 18:41:42 -08:00
parent 80c0531514 93b47684f6
commit 977127174a
68 changed files with 955 additions and 443 deletions
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -395,7 +395,7 @@ static struct pci_driver gemtek_pci_driver =

 static int __init gemtek_pci_init_module( void )
 {
-	return pci_module_init( &gemtek_pci_driver );
+	return pci_register_driver( &gemtek_pci_driver );
 }

 static void __exit gemtek_pci_cleanup_module( void )