diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2012-08-07 12:11:33 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-08-08 02:04:50 +0200 |
| commit | e1267371eacf2cbcf580e41f9e64a986cdaf5c1d (patch) | |
| tree | bbe84aabb1632342b2ec645fc76d1e9190a61af2 /arch | |
| parent | Linux 3.6-rc1 (diff) | |
| download | linux-e1267371eacf2cbcf580e41f9e64a986cdaf5c1d.tar.xz linux-e1267371eacf2cbcf580e41f9e64a986cdaf5c1d.zip | |
ARM: S3C24XX: Add missing DMACH_DT_PROP
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>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/dma.h | 3 |
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 454831b66037..ee99fd56c043 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, |