1 files changed, 10 insertions, 54 deletions

diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h
index 242be57a319c..32764cd077c6 100644
--- a/arch/microblaze/include/asm/pci-bridge.h
+++ b/arch/microblaze/include/asm/pci-bridge.h
@@ -10,28 +10,19 @@
 #include <linux/pci.h>
 #include <linux/list.h>
 #include <linux/ioport.h>
+#include <asm-generic/pci-bridge.h>
 
 struct device_node;
 
-enum {
-        /* Force re-assigning all resources (ignore firmware
-         * setup completely)
-         */
-        PCI_REASSIGN_ALL_RSRC   = 0x00000001,
-
-        /* Do not try to assign, just use existing setup */
-        PCI_PROBE_ONLY          = 0x00000004,
-
-        /* Don't bother with ISA alignment unless the bridge has
-         * ISA forwarding enabled
-         */
-        PCI_CAN_SKIP_ISA_ALIGN  = 0x00000008,
-
-        /* Enable domain numbers in /proc */
-        PCI_ENABLE_PROC_DOMAINS = 0x00000010,
-        /* ... except for domain 0 */
-        PCI_COMPAT_DOMAIN_0             = 0x00000020,
-};
+#ifdef CONFIG_PCI
+extern struct list_head hose_list;
+extern int pcibios_vaddr_is_ioport(void __iomem *address);
+#else
+static inline int pcibios_vaddr_is_ioport(void __iomem *address)
+{
+        return 0;
+}
+#endif
 
 /*
  * Structure of a PCI controller (host bridge)
@@ -151,40 +142,5 @@ extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev);
 extern void pcibios_free_controller(struct pci_controller *phb);
 extern void pcibios_setup_phb_resources(struct pci_controller *hose);
 
-#ifdef CONFIG_PCI
-extern unsigned int pci_flags;
-
-static inline void pci_set_flags(int flags)
-{
-        pci_flags = flags;
-}
-
-static inline void pci_add_flags(int flags)
-{
-        pci_flags |= flags;
-}
-
-static inline int pci_has_flag(int flag)
-{
-        return pci_flags & flag;
-}
-
-extern struct list_head hose_list;
-
-extern int pcibios_vaddr_is_ioport(void __iomem *address);
-#else
-static inline int pcibios_vaddr_is_ioport(void __iomem *address)
-{
-        return 0;
-}
-
-static inline void pci_set_flags(int flags) { }
-static inline void pci_add_flags(int flags) { }
-static inline int pci_has_flag(int flag)
-{
-        return 0;
-}
-#endif  /* CONFIG_PCI */
-
 #endif  /* __KERNEL__ */
 #endif  /* _ASM_MICROBLAZE_PCI_BRIDGE_H */