diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 18:57:38 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 18:57:38 +0900 |
| commit | 59ca37f74a6e9d3e9367359f2fcbb286df7d9748 (patch) | |
| tree | cbc0254ef952f10e99e384b56ccc7b81389e335e /arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | |
| parent | 7d84b3e93757fe871d57b43c422b81cc8b94057a (diff) | |
| parent | c9312209aa9fdef05b03d63bbead63bb720fd133 (diff) | |
| download | blackbird-op-linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.tar.gz blackbird-op-linux-59ca37f74a6e9d3e9367359f2fcbb286df7d9748.zip | |
Merge branch 'next/topic-dma-samsung' into next-samsung-devel
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/dma-s3c24xx.h')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-s3c24xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h b/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h index 336d5ac02035..19828296a562 100644 --- a/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h +++ b/arch/arm/plat-samsung/include/plat/dma-s3c24xx.h @@ -47,7 +47,7 @@ struct s3c24xx_dma_selection { void (*direction)(struct s3c2410_dma_chan *chan, struct s3c24xx_dma_map *map, - enum s3c2410_dmasrc dir); + enum dma_data_direction dir); }; extern int s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel); |
