A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 02:32:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
drivers/block/DAC960.c
View file

@ -7179,7 +7179,7 @@ static int DAC960_init_module(void)
{
int ret;
ret = pci_module_init(&DAC960_pci_driver);
ret = pci_register_driver(&DAC960_pci_driver);
#ifdef DAC960_GAM_MINOR
if (!ret)
DAC960_gam_init();

2
drivers/block/cciss.c
View file

@ -3360,7 +3360,7 @@ static int __init cciss_init(void)
printk(KERN_INFO DRIVER_NAME "\n");
/* Register for our PCI devices */
return pci_module_init(&cciss_pci_driver);
return pci_register_driver(&cciss_pci_driver);
}
static void __exit cciss_cleanup(void)

2
drivers/block/sx8.c
View file

@ -1755,7 +1755,7 @@ static void carm_remove_one (struct pci_dev *pdev)
static int __init carm_init(void)
{
return pci_module_init(&carm_driver);
return pci_register_driver(&carm_driver);
}
static void __exit carm_exit(void)

2
drivers/block/umem.c
View file

@ -1174,7 +1174,7 @@ static int __init mm_init(void)
printk(KERN_INFO DRIVER_VERSION " : " DRIVER_DESC "\n");
retval = pci_module_init(&mm_pci_driver);
retval = pci_register_driver(&mm_pci_driver);
if (retval)
return -ENOMEM;