diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 13:13:25 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 13:13:25 +0000 |
commit | 7d9aca39dcacd2b3f42e2e287162329f410f93e1 (patch) | |
tree | 2907b680b2b7625226f46d23d74ccc9c58ad0362 /include/linux/sh_dma.h | |
parent | e1c1c69c8fc7656c33460c8e085ac0d0be22ac3b (diff) | |
parent | a0cc0209abb9fe2b9ab71aa41be70eddd0cbdd61 (diff) | |
download | op-kernel-dev-7d9aca39dcacd2b3f42e2e287162329f410f93e1.zip op-kernel-dev-7d9aca39dcacd2b3f42e2e287162329f410f93e1.tar.gz |
Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
Resolved simple add/add conflicts:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c
Diffstat (limited to 'include/linux/sh_dma.h')
-rw-r--r-- | include/linux/sh_dma.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h index 8cd7fe5..425450b 100644 --- a/include/linux/sh_dma.h +++ b/include/linux/sh_dma.h @@ -70,6 +70,7 @@ struct sh_dmae_pdata { unsigned int needs_tend_set:1; unsigned int no_dmars:1; unsigned int chclr_present:1; + unsigned int slave_only:1; }; /* DMA register */ |