diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-13 09:34:11 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-13 09:34:11 +0400 |
| commit | 025c95a6826ad8acfe871f33c2fa9208beeb38df (patch) | |
| tree | 220fe156ff60db13bd3a1319f5e20d6b723de5f4 /arch/arm/mach-s3c24xx/include/mach/dma.h | |
| parent | 0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4 (diff) | |
| parent | 7f744b17140af1a9c8804a1c81c9dae6bb52a7fb (diff) | |
| download | linux-025c95a6826ad8acfe871f33c2fa9208beeb38df.tar.xz | |
Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup
* 'clk' of git://github.com/hzhuang1/linux:
ARM: mmp: remove unused definition in APBC and APMU
ARM: mmp: move mmp2 clock definition to separated file
arm: mmp: move pxa910 clock definition to separated file
arm: mmp: move pxa168 clock definition to separated file
arm: mmp: make private clock definition exclude from common clock
+ Linux 3.6-rc4
Diffstat (limited to 'arch/arm/mach-s3c24xx/include/mach/dma.h')
| -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, |