summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r--arch/powerpc/include/asm/pci-bridge.h32
-rw-r--r--arch/powerpc/include/asm/pci.h2
2 files changed, 17 insertions, 17 deletions
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index b90dbf8e5cd..b3a40c3d500 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -17,45 +17,45 @@ enum {
/* Force re-assigning all resources (ignore firmware
* setup completely)
*/
- PPC_PCI_REASSIGN_ALL_RSRC = 0x00000001,
+ PCI_REASSIGN_ALL_RSRC = 0x00000001,
/* Re-assign all bus numbers */
- PPC_PCI_REASSIGN_ALL_BUS = 0x00000002,
+ PCI_REASSIGN_ALL_BUS = 0x00000002,
/* Do not try to assign, just use existing setup */
- PPC_PCI_PROBE_ONLY = 0x00000004,
+ PCI_PROBE_ONLY = 0x00000004,
/* Don't bother with ISA alignment unless the bridge has
* ISA forwarding enabled
*/
- PPC_PCI_CAN_SKIP_ISA_ALIGN = 0x00000008,
+ PCI_CAN_SKIP_ISA_ALIGN = 0x00000008,
/* Enable domain numbers in /proc */
- PPC_PCI_ENABLE_PROC_DOMAINS = 0x00000010,
+ PCI_ENABLE_PROC_DOMAINS = 0x00000010,
/* ... except for domain 0 */
- PPC_PCI_COMPAT_DOMAIN_0 = 0x00000020,
+ PCI_COMPAT_DOMAIN_0 = 0x00000020,
};
#ifdef CONFIG_PCI
-extern unsigned int ppc_pci_flags;
+extern unsigned int pci_flags;
-static inline void ppc_pci_set_flags(int flags)
+static inline void pci_set_flags(int flags)
{
- ppc_pci_flags = flags;
+ pci_flags = flags;
}
-static inline void ppc_pci_add_flags(int flags)
+static inline void pci_add_flags(int flags)
{
- ppc_pci_flags |= flags;
+ pci_flags |= flags;
}
-static inline int ppc_pci_has_flag(int flag)
+static inline int pci_has_flag(int flag)
{
- return (ppc_pci_flags & flag);
+ return (pci_flags & flag);
}
#else
-static inline void ppc_pci_set_flags(int flags) { }
-static inline void ppc_pci_add_flags(int flags) { }
-static inline int ppc_pci_has_flag(int flag)
+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;
}
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index 7d7790954e0..b9a40faca93 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -44,7 +44,7 @@ struct pci_dev;
* bus numbers (don't do that on ppc64 yet !)
*/
#define pcibios_assign_all_busses() \
- (ppc_pci_has_flag(PPC_PCI_REASSIGN_ALL_BUS))
+ (pci_has_flag(PCI_REASSIGN_ALL_BUS))
static inline void pcibios_set_master(struct pci_dev *dev)
{