diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
| commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
| tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /include/asm-x86_64/pci.h | |
| parent | 044f324f6ea5d55391db62fca6a295b2651cb946 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
Diffstat (limited to 'include/asm-x86_64/pci.h')
| -rw-r--r-- | include/asm-x86_64/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h index fd03e15d7ea6..8a05af264d18 100644 --- a/include/asm-x86_64/pci.h +++ b/include/asm-x86_64/pci.h | |||
| @@ -19,8 +19,6 @@ extern unsigned int pcibios_assign_all_busses(void); | |||
| 19 | #endif | 19 | #endif |
| 20 | #define pcibios_scan_all_fns(a, b) 0 | 20 | #define pcibios_scan_all_fns(a, b) 0 |
| 21 | 21 | ||
| 22 | extern int no_iommu, force_iommu; | ||
| 23 | |||
| 24 | extern unsigned long pci_mem_start; | 22 | extern unsigned long pci_mem_start; |
| 25 | #define PCIBIOS_MIN_IO 0x1000 | 23 | #define PCIBIOS_MIN_IO 0x1000 |
| 26 | #define PCIBIOS_MIN_MEM (pci_mem_start) | 24 | #define PCIBIOS_MIN_MEM (pci_mem_start) |