git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull asus into release branch
[pandora-kernel.git]
/
drivers
/
ide
/
setup-pci.c
diff --git
a/drivers/ide/setup-pci.c
b/drivers/ide/setup-pci.c
index
695e239
..
118fb32
100644
(file)
--- a/
drivers/ide/setup-pci.c
+++ b/
drivers/ide/setup-pci.c
@@
-505,11
+505,6
@@
static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwi
}
}
}
}
}
}
-
-#ifndef CONFIG_IDEDMA_PCI_AUTO
-#warning CONFIG_IDEDMA_PCI_AUTO=n support is obsolete, and will be removed soon.
-#endif
-
#endif /* CONFIG_BLK_DEV_IDEDMA_PCI*/
/**
#endif /* CONFIG_BLK_DEV_IDEDMA_PCI*/
/**
@@
-783,10
+778,11
@@
static LIST_HEAD(ide_pci_drivers);
* Returns are the same as for pci_register_driver
*/
* Returns are the same as for pci_register_driver
*/
-int __ide_pci_register_driver(struct pci_driver *driver, struct module *module)
+int __ide_pci_register_driver(struct pci_driver *driver, struct module *module,
+ const char *mod_name)
{
if(!pre_init)
{
if(!pre_init)
- return __pci_register_driver(driver, module);
+ return __pci_register_driver(driver, module
, mod_name
);
driver->driver.owner = module;
list_add_tail(&driver->node, &ide_pci_drivers);
return 0;
driver->driver.owner = module;
list_add_tail(&driver->node, &ide_pci_drivers);
return 0;
@@
-862,6
+858,6
@@
void __init ide_scan_pcibus (int scan_direction)
{
list_del(l);
d = list_entry(l, struct pci_driver, node);
{
list_del(l);
d = list_entry(l, struct pci_driver, node);
- __pci_register_driver(d, d->driver.owner);
+ __pci_register_driver(d, d->driver.owner
, d->driver.mod_name
);
}
}
}
}