diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:15:53 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:15:53 +0000 |
commit | 4eb821999086417ab42a15174b51497122fc406e (patch) | |
tree | 3ef7a628f82286f018df7d9d5f48da475d09c349 /arch/arm/plat-samsung/include/plat/dma-ops.h | |
parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
parent | 0561ceabd0f13871900d116278fe9268aeb714d1 (diff) | |
download | blackbird-op-linux-4eb821999086417ab42a15174b51497122fc406e.tar.gz blackbird-op-linux-4eb821999086417ab42a15174b51497122fc406e.zip |
Merge branch 'next-samsung-devel-dt1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/dt
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/dma-ops.h')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-ops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h index 4c1a363526cf..22eafc310bd7 100644 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h @@ -31,6 +31,7 @@ struct samsung_dma_info { enum dma_slave_buswidth width; dma_addr_t fifo; struct s3c2410_dma_client *client; + struct property *dt_dmach_prop; }; struct samsung_dma_ops { |