summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-22 17:04:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-22 17:04:58 -0700
commit130eb4653550ff9c73e09858464446cc9d59ff7b (patch)
tree9e2fbe1a3ef2d6dc99f2507a90403a307cb1e487 /include
parentf16278c679aa72e28288435b313ba2d4494d6be5 (diff)
parent9e9630481ee8ef33f1cce71ce3636169fa37cd49 (diff)
downloadop-kernel-dev-130eb4653550ff9c73e09858464446cc9d59ff7b.zip
op-kernel-dev-130eb4653550ff9c73e09858464446cc9d59ff7b.tar.gz
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.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86/pci_64.h b/include/asm-x86/pci_64.h
index da8266a..3746903 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
-extern void dma32_reserve_bootmem(void);
extern void pci_iommu_alloc(void);
/* The PCI address space does equal the physical memory
OpenPOWER on IntegriCloud