diff options
| author | Ingo Molnar | 2008-11-21 08:57:04 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-11-21 08:57:04 +0100 |
| commit | fc02e90c34bacd5d7bc77b832c65a8f06e1bd60e (patch) | |
| tree | d870acafa2290779aa7c0594172bf1c691d3e6c0 /arch/ia64/kernel/pci-dma.c | |
| parent | sched: fix inconsistency when redistribute per-cpu tg->cfs_rq shares (diff) | |
| parent | Linux 2.6.28-rc6 (diff) | |
| download | kernel-qcow2-linux-fc02e90c34bacd5d7bc77b832c65a8f06e1bd60e.tar.gz kernel-qcow2-linux-fc02e90c34bacd5d7bc77b832c65a8f06e1bd60e.tar.xz kernel-qcow2-linux-fc02e90c34bacd5d7bc77b832c65a8f06e1bd60e.zip | |
Merge commit 'v2.6.28-rc6' into sched/core
Diffstat (limited to 'arch/ia64/kernel/pci-dma.c')
| -rw-r--r-- | arch/ia64/kernel/pci-dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index dbdb778efa05..2a92f637431d 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c @@ -19,7 +19,6 @@ #include <linux/kernel.h> #include <asm/page.h> -#include <asm/iommu.h> dma_addr_t bad_dma_address __read_mostly; EXPORT_SYMBOL(bad_dma_address); |