diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-22 20:04:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-22 20:04:58 -0400 |
| commit | 130eb4653550ff9c73e09858464446cc9d59ff7b (patch) | |
| tree | 9e2fbe1a3ef2d6dc99f2507a90403a307cb1e487 /include | |
| parent | f16278c679aa72e28288435b313ba2d4494d6be5 (diff) | |
| parent | 9e9630481ee8ef33f1cce71ce3636169fa37cd49 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: revert: reserve dma32 early for gart
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/pci_64.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86/pci_64.h b/include/asm-x86/pci_64.h index da8266a08005..374690314539 100644 --- a/include/asm-x86/pci_64.h +++ b/include/asm-x86/pci_64.h | |||
| @@ -25,7 +25,6 @@ extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int l | |||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | extern void dma32_reserve_bootmem(void); | ||
| 29 | extern void pci_iommu_alloc(void); | 28 | extern void pci_iommu_alloc(void); |
| 30 | 29 | ||
| 31 | /* The PCI address space does equal the physical memory | 30 | /* The PCI address space does equal the physical memory |