summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2012-08-07 19:11:33 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 10:00:04 -0700
commitcef2cf5590819d565db994008a6bbb9f27dd9b41 (patch)
tree77de1ff18f51bee0c2ab2f3135f29de27f40b4ca
parent8c17041815762b385631d3a680128dca5a9be31b (diff)
downloadlinux-3.10-cef2cf5590819d565db994008a6bbb9f27dd9b41.tar.gz
linux-3.10-cef2cf5590819d565db994008a6bbb9f27dd9b41.tar.bz2
linux-3.10-cef2cf5590819d565db994008a6bbb9f27dd9b41.zip
ARM: S3C24XX: Add missing DMACH_DT_PROP
commit e1267371eacf2cbcf580e41f9e64a986cdaf5c1d upstream. Commit 2b90807549 (spi: s3c64xx: add device tree support) requires the DMACH_DT_PROP element in the dma_ch enum. It's not used on non-DT platforms but has to be present nevertheless. So mimic the dummy-add of DMACH_DT_PROP on s3c64xx for s3c24xx machines, to correct the build breakage for the s3c24xx variants using the s3c64xx-spi-driver. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/mach-s3c24xx/include/mach/dma.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/include/mach/dma.h b/arch/arm/mach-s3c24xx/include/mach/dma.h
index acbdfecd418..ccaaafc65c1 100644
--- a/arch/arm/mach-s3c24xx/include/mach/dma.h
+++ b/arch/arm/mach-s3c24xx/include/mach/dma.h
@@ -24,7 +24,8 @@
*/
enum dma_ch {
- DMACH_XD0,
+ DMACH_DT_PROP = -1, /* not yet supported, do not use */
+ DMACH_XD0 = 0,
DMACH_XD1,
DMACH_SDI,
DMACH_SPI0,