Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / linux / dma / xilinx_dma.h

diff --git a/include/linux/amba/xilinx_dma.h b/include/linux/dma/xilinx_dma.h
similarity index 100%
rename from include/linux/amba/xilinx_dma.h
rename to include/linux/dma/xilinx_dma.h