aboutsummaryrefslogtreecommitdiffstats
path: root/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-12-23 10:44:23 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-12-23 10:44:23 -0800
commit373ecab16727fcb04e0d4684f5c65ce92f2e6ede (patch)
tree87c3978c3145658c7e75fa855375eff6bf562770 /pci
parent358ab939884962f98c4143756a8c42943e77be12 (diff)
downloadpatches-373ecab16727fcb04e0d4684f5c65ce92f2e6ede.tar.gz
2.6.15-rc6-git4 refresh
Diffstat (limited to 'pci')
-rw-r--r--pci/shot-accross-the-bow.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/pci/shot-accross-the-bow.patch b/pci/shot-accross-the-bow.patch
index a3b4ddb0e8468..1c509d3f0ab07 100644
--- a/pci/shot-accross-the-bow.patch
+++ b/pci/shot-accross-the-bow.patch
@@ -142,7 +142,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
+EXPORT_SYMBOL_GPL(pci_dev_put);
--- gregkh-2.6.orig/drivers/pci/pci.c
+++ gregkh-2.6/drivers/pci/pci.c
-@@ -427,7 +427,7 @@ pci_power_t pci_choose_state(struct pci_
+@@ -428,7 +428,7 @@ pci_power_t pci_choose_state(struct pci_
return PCI_D0;
}
@@ -151,7 +151,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
/**
* pci_save_state - save the PCI configuration space of a device before suspending
-@@ -912,34 +912,34 @@ __setup("pci=", pci_setup);
+@@ -913,34 +913,34 @@ __setup("pci=", pci_setup);
#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
/* FIXME: Some boxes have multiple ISA bridges! */
struct pci_dev *isa_bridge;