diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 15:59:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 15:59:55 -0500 |
| commit | 733abe4fff3afa13e301bc8bc5bee9aac4b59fdc (patch) | |
| tree | c11f08a401783848deb7f41f65e990333971ba66 /include | |
| parent | 5fe8252fc3a21666cf19053fbd7ec7bd9664f5d9 (diff) | |
| parent | 81bb0e198b4638ac65233b316f4588639dfe1fcd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: Make PCI device numa-node attribute visible in sysfs
PCI: add systems for automatic breadth-first device sorting
PCI: PCI devices get assigned redundant IRQs
PCI: Make CARDBUS_MEM_SIZE and CARDBUS_IO_SIZE boot options
PCI: pci.txt fix __devexit() usage
PCI/sysfs/kobject kernel-doc fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 98c8765a488e..2c4b6842dfb9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -854,5 +854,8 @@ extern int pci_pci_problems; | |||
| 854 | #define PCIPCI_ALIMAGIK 32 /* Need low latency setting */ | 854 | #define PCIPCI_ALIMAGIK 32 /* Need low latency setting */ |
| 855 | #define PCIAGP_FAIL 64 /* No PCI to AGP DMA */ | 855 | #define PCIAGP_FAIL 64 /* No PCI to AGP DMA */ |
| 856 | 856 | ||
| 857 | extern unsigned long pci_cardbus_io_size; | ||
| 858 | extern unsigned long pci_cardbus_mem_size; | ||
| 859 | |||
| 857 | #endif /* __KERNEL__ */ | 860 | #endif /* __KERNEL__ */ |
| 858 | #endif /* LINUX_PCI_H */ | 861 | #endif /* LINUX_PCI_H */ |