diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-10 09:52:39 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-10 09:52:39 -0800 |
| commit | e781fd60c26c83812bb447970ace13d5fe48aeea (patch) | |
| tree | 950cb73c1f899feb927714029b0e9ebc049200fd /pci | |
| parent | 417248e494454b1add4cad702bd02236cd710d94 (diff) | |
| download | patches-e781fd60c26c83812bb447970ace13d5fe48aeea.tar.gz | |
2.6.15-git6 refresh
Diffstat (limited to 'pci')
4 files changed, 5 insertions, 5 deletions
diff --git a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch index ed3db950a1678..636ef13f33b9b 100644 --- a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch +++ b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch @@ -272,7 +272,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __exit fealnx_exit(void) --- gregkh-2.6.orig/drivers/net/forcedeth.c +++ gregkh-2.6/drivers/net/forcedeth.c -@@ -2721,7 +2721,7 @@ static struct pci_driver driver = { +@@ -2757,7 +2757,7 @@ static struct pci_driver driver = { static int __init init_nic(void) { printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION); diff --git a/pci/drivers-scsi-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-scsi-replace-pci_module_init-with-pci_register_driver.patch index 018b7ada154cd..0f2423204cac9 100644 --- a/pci/drivers-scsi-replace-pci_module_init-with-pci_register_driver.patch +++ b/pci/drivers-scsi-replace-pci_module_init-with-pci_register_driver.patch @@ -307,7 +307,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __exit mv_exit(void) --- gregkh-2.6.orig/drivers/scsi/sata_nv.c +++ gregkh-2.6/drivers/scsi/sata_nv.c -@@ -590,7 +590,7 @@ static void nv_check_hotplug_ck804(struc +@@ -608,7 +608,7 @@ static int nv_check_hotplug_ck804(struct static int __init nv_init(void) { diff --git a/pci/pci-schedule-removal-of-pci_module_init.patch b/pci/pci-schedule-removal-of-pci_module_init.patch index 032d47f41c0fa..7a10cc152feba 100644 --- a/pci/pci-schedule-removal-of-pci_module_init.patch +++ b/pci/pci-schedule-removal-of-pci_module_init.patch @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static inline int pci_register_driver(struct pci_driver *driver) { return __pci_register_driver(driver, THIS_MODULE); -@@ -621,6 +619,7 @@ static inline void pci_disable_device(st +@@ -622,6 +620,7 @@ static inline void pci_disable_device(st static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) { return -EIO; } static inline int pci_assign_resource(struct pci_dev *dev, int i) { return -EBUSY;} static inline int __pci_register_driver(struct pci_driver *drv, struct module *owner) { return 0;} diff --git a/pci/pci-update-toshiba-ohci-quirk-dmi-table.patch b/pci/pci-update-toshiba-ohci-quirk-dmi-table.patch index de79a5f0ee3b6..89f1637dc3d86 100644 --- a/pci/pci-update-toshiba-ohci-quirk-dmi-table.patch +++ b/pci/pci-update-toshiba-ohci-quirk-dmi-table.patch @@ -22,8 +22,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/i386/pci/fixup.c +++ gregkh-2.6/arch/i386/pci/fixup.c -@@ -413,6 +413,13 @@ static struct dmi_system_id __devinitdat - DMI_MATCH(DMI_PRODUCT_VERSION, "PSM4"), +@@ -420,6 +420,13 @@ static struct dmi_system_id __devinitdat + DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), }, }, + { |