diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 14:12:05 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 14:12:05 +0200 |
commit | 31dfec74c0dc49521b2e17543ff9dd9dd0221702 (patch) | |
tree | c97607d7d6db0597dffd2dc96854e706b54a8088 /drivers/hwmon/adm1029.c | |
parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
parent | 3688be49e901551756f4c570a8eb3b98b1e2bbe5 (diff) | |
download | blackbird-obmc-linux-31dfec74c0dc49521b2e17543ff9dd9dd0221702.tar.gz blackbird-obmc-linux-31dfec74c0dc49521b2e17543ff9dd9dd0221702.zip |
Merge branch 'next/devel-dma-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dma
From Kukjin Kim <kgene.kim@samsung.com>:
Here is updating DMA common operation for Samsung SoCs.
Since some DMA client driver such as spi needs to change the configuration
after dma_request() so this branch adds dma_config() can configure DMA
transmit option which is included in dma_request() after that.
Note, according to the changes, needs to update spi and ASoC drivers
for Samsung SoCs and only got the ack from Mark Brown not Grant Likely
and as I know, he is busy for moving. But I think, the spi change has
no problem and it is simple.
* 'next/devel-dma-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Fix compiler warning in dma-ops.c file
ASoC: follow the updated samsung DMA common operations
spi/s3c64xx: Add the use of DMA config operation
ARM: SAMSUNG: Add config() function in DMA common operations
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/hwmon/adm1029.c')
0 files changed, 0 insertions, 0 deletions