aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/swiotlb.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 17:00:33 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 17:00:33 +0000
commit3d14b5beba35250c548d3851a2b84fce742d8311 (patch)
tree065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/ia64/include/asm/swiotlb.h
parent0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff)
parent1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff)
downloadkernel_goldelico_gta04-3d14b5beba35250c548d3851a2b84fce742d8311.zip
kernel_goldelico_gta04-3d14b5beba35250c548d3851a2b84fce742d8311.tar.gz
kernel_goldelico_gta04-3d14b5beba35250c548d3851a2b84fce742d8311.tar.bz2
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/ia64/include/asm/swiotlb.h')
-rw-r--r--arch/ia64/include/asm/swiotlb.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/swiotlb.h b/arch/ia64/include/asm/swiotlb.h
index dcbaea7..f0acde6 100644
--- a/arch/ia64/include/asm/swiotlb.h
+++ b/arch/ia64/include/asm/swiotlb.h
@@ -4,8 +4,6 @@
#include <linux/dma-mapping.h>
#include <linux/swiotlb.h>
-extern int swiotlb_force;
-
#ifdef CONFIG_SWIOTLB
extern int swiotlb;
extern void pci_swiotlb_init(void);