From 0dd1352b777a66874cb78868c65c15c7e222cec3 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 5 May 2008 21:25:47 +0300
Subject: [PATCH] --- yaml --- r: 102221 b: refs/heads/master c:
 19792a0859f96e9fc8ce87d97b269bcb895389e5 h: refs/heads/master i:   102219:
 db2274337b81fb60dcaeab558e0c0ad968ef654f v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/pci.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9de3d6d6cee6..b8a486f2ec98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 552fe04aa242f164f126abfdb3f6f90fd6679d9f
+refs/heads/master: 19792a0859f96e9fc8ce87d97b269bcb895389e5
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index 509159bcd4e7..aaa9f333fb44 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -1059,7 +1059,10 @@ extern int pci_pci_problems;
 extern unsigned long pci_cardbus_io_size;
 extern unsigned long pci_cardbus_mem_size;
 
-extern int pcibios_add_platform_entries(struct pci_dev *dev);
+int pcibios_add_platform_entries(struct pci_dev *dev);
+void pcibios_disable_device(struct pci_dev *dev);
+int pcibios_set_pcie_reset_state(struct pci_dev *dev,
+				 enum pcie_reset_state state);
 
 #ifdef CONFIG_PCI_MMCONFIG
 extern void __init pci_mmcfg_early_init(void);