Merge branch 'x86/core' into x86/apic

[karo-tx-linux.git] / include / asm-x86 / pci_64.h

diff --git a/include/asm-x86/pci_64.h b/include/asm-x86/pci_64.h
index 374690314539c6858ad465396e6ba8397048f8da..f72e12d5770ef275aff119c8c136a70b75ed047a 100644 (file)
--- a/include/asm-x86/pci_64.h
+++ b/include/asm-x86/pci_64.h
@@ -1,12 +1,10 @@
-#ifndef __x8664_PCI_H
-#define __x8664_PCI_H
-
+#ifndef ASM_X86__PCI_64_H
+#define ASM_X86__PCI_64_H
 
 #ifdef __KERNEL__
 
-
 #ifdef CONFIG_CALGARY_IOMMU
-static inline void* pci_iommu(struct pci_bus *bus)
+static inline void *pci_iommu(struct pci_bus *bus)
 {
        struct pci_sysdata *sd = bus->sysdata;
        return sd->iommu;
@@ -19,12 +17,12 @@ static inline void set_pci_iommu(struct pci_bus *bus, void *val)
 }
 #endif /* CONFIG_CALGARY_IOMMU */
 
+extern int (*pci_config_read)(int seg, int bus, int dev, int fn,
+                             int reg, int len, u32 *value);
+extern int (*pci_config_write)(int seg, int bus, int dev, int fn,
+                              int reg, int len, u32 value);
 
-extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value);
-extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value);
-
-
-
+extern void dma32_reserve_bootmem(void);
 extern void pci_iommu_alloc(void);
 
 /* The PCI address space does equal the physical memory
@@ -65,5 +63,4 @@ extern void pci_iommu_alloc(void);
 
 #endif /* __KERNEL__ */
 
-
-#endif /* __x8664_PCI_H */
+#endif /* ASM_X86__PCI_64_H */