diff options
Diffstat (limited to 'include/asm-x86/pci_64.h')
-rw-r--r-- | include/asm-x86/pci_64.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/include/asm-x86/pci_64.h b/include/asm-x86/pci_64.h index 374690314539..df867e5d80b1 100644 --- a/include/asm-x86/pci_64.h +++ b/include/asm-x86/pci_64.h | |||
@@ -1,12 +1,10 @@ | |||
1 | #ifndef __x8664_PCI_H | 1 | #ifndef __x8664_PCI_H |
2 | #define __x8664_PCI_H | 2 | #define __x8664_PCI_H |
3 | 3 | ||
4 | |||
5 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
6 | 5 | ||
7 | |||
8 | #ifdef CONFIG_CALGARY_IOMMU | 6 | #ifdef CONFIG_CALGARY_IOMMU |
9 | static inline void* pci_iommu(struct pci_bus *bus) | 7 | static inline void *pci_iommu(struct pci_bus *bus) |
10 | { | 8 | { |
11 | struct pci_sysdata *sd = bus->sysdata; | 9 | struct pci_sysdata *sd = bus->sysdata; |
12 | return sd->iommu; | 10 | return sd->iommu; |
@@ -19,11 +17,10 @@ static inline void set_pci_iommu(struct pci_bus *bus, void *val) | |||
19 | } | 17 | } |
20 | #endif /* CONFIG_CALGARY_IOMMU */ | 18 | #endif /* CONFIG_CALGARY_IOMMU */ |
21 | 19 | ||
22 | 20 | extern int (*pci_config_read)(int seg, int bus, int dev, int fn, | |
23 | extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value); | 21 | int reg, int len, u32 *value); |
24 | extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value); | 22 | extern int (*pci_config_write)(int seg, int bus, int dev, int fn, |
25 | 23 | int reg, int len, u32 value); | |
26 | |||
27 | 24 | ||
28 | extern void pci_iommu_alloc(void); | 25 | extern void pci_iommu_alloc(void); |
29 | 26 | ||
@@ -65,5 +62,4 @@ extern void pci_iommu_alloc(void); | |||
65 | 62 | ||
66 | #endif /* __KERNEL__ */ | 63 | #endif /* __KERNEL__ */ |
67 | 64 | ||
68 | |||
69 | #endif /* __x8664_PCI_H */ | 65 | #endif /* __x8664_PCI_H */ |