diff options
Diffstat (limited to 'include/asm-x86/pci.h')
| -rw-r--r-- | include/asm-x86/pci.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h index c61190cb9e12..ddd8e248fc0a 100644 --- a/include/asm-x86/pci.h +++ b/include/asm-x86/pci.h | |||
| @@ -8,14 +8,13 @@ | |||
| 8 | #include <asm/scatterlist.h> | 8 | #include <asm/scatterlist.h> |
| 9 | #include <asm/io.h> | 9 | #include <asm/io.h> |
| 10 | 10 | ||
| 11 | |||
| 12 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
| 13 | 12 | ||
| 14 | struct pci_sysdata { | 13 | struct pci_sysdata { |
| 15 | int domain; /* PCI domain */ | 14 | int domain; /* PCI domain */ |
| 16 | int node; /* NUMA node */ | 15 | int node; /* NUMA node */ |
| 17 | #ifdef CONFIG_X86_64 | 16 | #ifdef CONFIG_X86_64 |
| 18 | void* iommu; /* IOMMU private data */ | 17 | void *iommu; /* IOMMU private data */ |
| 19 | #endif | 18 | #endif |
| 20 | }; | 19 | }; |
| 21 | 20 | ||
| @@ -52,7 +51,7 @@ extern unsigned long pci_mem_start; | |||
| 52 | #define PCIBIOS_MIN_CARDBUS_IO 0x4000 | 51 | #define PCIBIOS_MIN_CARDBUS_IO 0x4000 |
| 53 | 52 | ||
| 54 | void pcibios_config_init(void); | 53 | void pcibios_config_init(void); |
| 55 | struct pci_bus * pcibios_scan_root(int bus); | 54 | struct pci_bus *pcibios_scan_root(int bus); |
| 56 | 55 | ||
| 57 | void pcibios_set_master(struct pci_dev *dev); | 56 | void pcibios_set_master(struct pci_dev *dev); |
| 58 | void pcibios_penalize_isa_irq(int irq, int active); | 57 | void pcibios_penalize_isa_irq(int irq, int active); |
| @@ -62,7 +61,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); | |||
| 62 | 61 | ||
| 63 | #define HAVE_PCI_MMAP | 62 | #define HAVE_PCI_MMAP |
| 64 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | 63 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, |
| 65 | enum pci_mmap_state mmap_state, int write_combine); | 64 | enum pci_mmap_state mmap_state, |
| 65 | int write_combine); | ||
| 66 | 66 | ||
| 67 | 67 | ||
| 68 | #ifdef CONFIG_PCI | 68 | #ifdef CONFIG_PCI |
