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

mmc: omap_hsmmc: split omap-dma header file

moving dmaengine consumer specific function to omap-dmaengine.h
to Resolve build failure seen with sh-allmodconfig:
include/linux/omap-dma.h:171:8: error: expected identifier before numeric constant
make[4]: *** [drivers/mmc/host/omap_hsmmc.o] Error 1

Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>

authored by

Balaji T K and committed by
Chris Ball
ee526d51 2177fa94

+23 -19
+1 -1
drivers/mmc/host/omap_hsmmc.c
··· 31 31 #include <linux/of.h> 32 32 #include <linux/of_gpio.h> 33 33 #include <linux/of_device.h> 34 - #include <linux/omap-dma.h> 34 + #include <linux/omap-dmaengine.h> 35 35 #include <linux/mmc/host.h> 36 36 #include <linux/mmc/core.h> 37 37 #include <linux/mmc/mmc.h>
+1 -18
include/linux/omap-dma.h
··· 1 - /* 2 - * OMAP DMA Engine support 3 - * 4 - * This program is free software; you can redistribute it and/or modify 5 - * it under the terms of the GNU General Public License version 2 as 6 - * published by the Free Software Foundation. 7 - */ 8 1 #ifndef __LINUX_OMAP_DMA_H 9 2 #define __LINUX_OMAP_DMA_H 10 - 11 - struct dma_chan; 12 - 13 - #if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE) 14 - bool omap_dma_filter_fn(struct dma_chan *, void *); 15 - #else 16 - static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d) 17 - { 18 - return false; 19 - } 20 - #endif 3 + #include <linux/omap-dmaengine.h> 21 4 22 5 /* 23 6 * Legacy OMAP DMA handling defines and functions
+21
include/linux/omap-dmaengine.h
··· 1 + /* 2 + * OMAP DMA Engine support 3 + * 4 + * This program is free software; you can redistribute it and/or modify 5 + * it under the terms of the GNU General Public License version 2 as 6 + * published by the Free Software Foundation. 7 + */ 8 + #ifndef __LINUX_OMAP_DMAENGINE_H 9 + #define __LINUX_OMAP_DMAENGINE_H 10 + 11 + struct dma_chan; 12 + 13 + #if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE) 14 + bool omap_dma_filter_fn(struct dma_chan *, void *); 15 + #else 16 + static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d) 17 + { 18 + return false; 19 + } 20 + #endif 21 + #endif /* __LINUX_OMAP_DMAENGINE_H */