Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.h

The header ipu.h really belongs to dma subsystem rather than imx
platform. Rename it to ipu-dma.h and put it into include/linux/dma/.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-media@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org

Shawn Guo b8a6d998 d6071738

+7 -9
+3 -3
arch/arm/mach-imx/include/mach/ipu.h include/linux/dma/ipu-dma.h
··· 9 9 * published by the Free Software Foundation. 10 10 */ 11 11 12 - #ifndef _IPU_H_ 13 - #define _IPU_H_ 12 + #ifndef __LINUX_DMA_IPU_DMA_H 13 + #define __LINUX_DMA_IPU_DMA_H 14 14 15 15 #include <linux/types.h> 16 16 #include <linux/dmaengine.h> ··· 174 174 #define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd) 175 175 #define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan) 176 176 177 - #endif 177 + #endif /* __LINUX_DMA_IPU_DMA_H */
+1 -2
drivers/dma/ipu/ipu_idmac.c
··· 22 22 #include <linux/interrupt.h> 23 23 #include <linux/io.h> 24 24 #include <linux/module.h> 25 - 26 - #include <mach/ipu.h> 25 + #include <linux/dma/ipu-dma.h> 27 26 28 27 #include "../dmaengine.h" 29 28 #include "ipu_intern.h"
+1 -2
drivers/dma/ipu/ipu_irq.c
··· 15 15 #include <linux/irq.h> 16 16 #include <linux/io.h> 17 17 #include <linux/module.h> 18 - 19 - #include <mach/ipu.h> 18 + #include <linux/dma/ipu-dma.h> 20 19 21 20 #include "ipu_intern.h" 22 21
+1 -1
drivers/media/platform/soc_camera/mx3_camera.c
··· 17 17 #include <linux/vmalloc.h> 18 18 #include <linux/interrupt.h> 19 19 #include <linux/sched.h> 20 + #include <linux/dma/ipu-dma.h> 20 21 21 22 #include <media/v4l2-common.h> 22 23 #include <media/v4l2-dev.h> ··· 25 24 #include <media/soc_camera.h> 26 25 #include <media/soc_mediabus.h> 27 26 28 - #include <mach/ipu.h> 29 27 #include <linux/platform_data/camera-mx3.h> 30 28 #include <linux/platform_data/dma-imx.h> 31 29
+1 -1
drivers/video/mx3fb.c
··· 26 26 #include <linux/console.h> 27 27 #include <linux/clk.h> 28 28 #include <linux/mutex.h> 29 + #include <linux/dma/ipu-dma.h> 29 30 30 31 #include <linux/platform_data/dma-imx.h> 31 32 #include <mach/hardware.h> 32 - #include <mach/ipu.h> 33 33 #include <linux/platform_data/video-mx3fb.h> 34 34 35 35 #include <asm/io.h>