diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 15:47:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 15:47:19 -0800 |
| commit | 4a31c08d2fecc74a630653828f5388fbb037f8c2 (patch) | |
| tree | c3baf80157bab2cf6bdf3d26772001e43233aad6 /sound | |
| parent | 2ddb3b15f1b46836c61cfac5b00d8f08a24236e6 (diff) | |
| parent | 0272282f7cffb469cd2676dcb6e58bc942fcf8a8 (diff) | |
| download | linux-4a31c08d2fecc74a630653828f5388fbb037f8c2.tar.gz linux-4a31c08d2fecc74a630653828f5388fbb037f8c2.tar.bz2 linux-4a31c08d2fecc74a630653828f5388fbb037f8c2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits)
sh: Convert sh to use read/update_persistent_clock
sh: Move PMB debugfs entry initialization to later stage
sh: Fix up flush_cache_vmap() on SMP.
sh: fix up MMU reset with variable PMB mapping sizes.
sh: establish PMB mappings for NUMA nodes.
sh: check for existing mappings for bolted PMB entries.
sh: fixed virt/phys mapping helpers for PMB.
sh: make pmb iomapping configurable.
sh: reworked dynamic PMB mapping.
sh: Fix up cpumask_of_pcibus() for the NUMA build.
serial: sh-sci: Tidy up build warnings.
sh: Fix up ctrl_read/write stragglers in migor setup.
serial: sh-sci: Add DMA support.
dmaengine: shdma: extend .device_terminate_all() to record partial transfer
sh: merge sh7722 and sh7724 DMA register definitions
sh: activate runtime PM for dmaengine on sh7722 and sh7724
dmaengine: shdma: add runtime PM support.
dmaengine: shdma: separate DMA headers.
dmaengine: shdma: convert to platform device resources
dmaengine: shdma: fix DMA error handling.
...
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/siu.h | 2 | ||||
| -rw-r--r-- | sound/soc/sh/siu_pcm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/siu.h b/sound/soc/sh/siu.h index 9cc04ab2bce7..c0bfab8fed3d 100644 --- a/sound/soc/sh/siu.h +++ b/sound/soc/sh/siu.h @@ -72,7 +72,7 @@ struct siu_firmware { #include <linux/interrupt.h> #include <linux/io.h> -#include <asm/dma-sh.h> +#include <asm/dmaengine.h> #include <sound/core.h> #include <sound/pcm.h> diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index c5efc30f0136..ba7f8d05d977 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c @@ -32,7 +32,7 @@ #include <sound/pcm_params.h> #include <sound/soc-dai.h> -#include <asm/dma-sh.h> +#include <asm/dmaengine.h> #include <asm/siu.h> #include "siu.h" |