diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-06 10:16:20 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-06 10:16:20 -0700 |
commit | fe478e333919011b5199264b34a647ea51f654b3 (patch) | |
tree | e47b3a942acf90ef81c60b4c6afcc263a7dc29da /pci | |
parent | ce40196200ca234d1abe8dd66a96906745501a05 (diff) | |
download | patches-fe478e333919011b5199264b34a647ea51f654b3.tar.gz |
another patch...
Diffstat (limited to 'pci')
-rw-r--r-- | pci/msi-save-restore-for-suspend-resume.patch | 4 | ||||
-rw-r--r-- | pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pci/msi-save-restore-for-suspend-resume.patch b/pci/msi-save-restore-for-suspend-resume.patch index 7e8a36c7f5f40..c209ebf4371a9 100644 --- a/pci/msi-save-restore-for-suspend-resume.patch +++ b/pci/msi-save-restore-for-suspend-resume.patch @@ -276,7 +276,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -444,6 +444,10 @@ pci_save_state(struct pci_dev *dev) +@@ -446,6 +446,10 @@ pci_save_state(struct pci_dev *dev) /* XXX: 100% dword access ok here? */ for (i = 0; i < 16; i++) pci_read_config_dword(dev, i * 4,&dev->saved_config_space[i]); @@ -287,7 +287,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -458,6 +462,8 @@ pci_restore_state(struct pci_dev *dev) +@@ -460,6 +464,8 @@ pci_restore_state(struct pci_dev *dev) for (i = 0; i < 16; i++) pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]); diff --git a/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch b/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch index 1ba3a760d752f..4e3bf2da4acee 100644 --- a/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch +++ b/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pci/pci-driver.c +++ gregkh-2.6/drivers/pci/pci-driver.c -@@ -291,7 +291,8 @@ static void pci_default_resume(struct pc +@@ -293,7 +293,8 @@ static void pci_default_resume(struct pc pci_restore_state(pci_dev); /* if the device was enabled before suspend, reenable */ if (pci_dev->is_enabled) @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pci_set_master(pci_dev); --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c -@@ -488,6 +488,9 @@ pci_enable_device_bars(struct pci_dev *d +@@ -490,6 +490,9 @@ pci_enable_device_bars(struct pci_dev *d err = pcibios_enable_device(dev, bars); if (err < 0) return err; @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -505,8 +508,6 @@ pci_enable_device(struct pci_dev *dev) +@@ -507,8 +510,6 @@ pci_enable_device(struct pci_dev *dev) int err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1); if (err) return err; @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } -@@ -541,6 +542,7 @@ pci_disable_device(struct pci_dev *dev) +@@ -543,6 +544,7 @@ pci_disable_device(struct pci_dev *dev) pcibios_disable_device(dev); dev->is_enabled = 0; @@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -623,6 +625,12 @@ void pci_release_region(struct pci_dev * +@@ -625,6 +627,12 @@ void pci_release_region(struct pci_dev * { if (pci_resource_len(pdev, bar) == 0) return; @@ -92,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) release_region(pci_resource_start(pdev, bar), pci_resource_len(pdev, bar)); -@@ -649,7 +657,12 @@ int pci_request_region(struct pci_dev *p +@@ -651,7 +659,12 @@ int pci_request_region(struct pci_dev *p { if (pci_resource_len(pdev, bar) == 0) return 0; @@ -106,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) { if (!request_region(pci_resource_start(pdev, bar), pci_resource_len(pdev, bar), res_name)) -@@ -687,7 +700,8 @@ void pci_release_regions(struct pci_dev +@@ -689,7 +702,8 @@ void pci_release_regions(struct pci_dev int i; for (i = 0; i < 6; i++) @@ -116,7 +116,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -708,13 +722,15 @@ int pci_request_regions(struct pci_dev * +@@ -710,13 +724,15 @@ int pci_request_regions(struct pci_dev * int i; for (i = 0; i < 6; i++) @@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -EBUSY; } -@@ -889,6 +905,22 @@ pci_set_consistent_dma_mask(struct pci_d +@@ -891,6 +907,22 @@ pci_set_consistent_dma_mask(struct pci_d } #endif @@ -158,7 +158,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int __devinit pci_init(void) { struct pci_dev *dev = NULL; -@@ -946,6 +978,7 @@ EXPORT_SYMBOL(pci_set_dma_mask); +@@ -948,6 +980,7 @@ EXPORT_SYMBOL(pci_set_dma_mask); EXPORT_SYMBOL(pci_set_consistent_dma_mask); EXPORT_SYMBOL(pci_assign_resource); EXPORT_SYMBOL(pci_find_parent_resource); |