manual update from upstream:
Tony Luck [Mon, 31 Oct 2005 18:51:57 +0000 (10:51 -0800)]
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4
to new location of swiotlb.c

Signed-off-by: Tony Luck <tony.luck@intel.com>

1  2 
arch/ia64/Kconfig
include/asm-x86_64/dma-mapping.h
include/asm-x86_64/swiotlb.h
lib/swiotlb.c

Simple merge
Simple merge
Simple merge
diff --cc lib/swiotlb.c
Simple merge