diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 11:07:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-31 11:07:15 +0100 |
| commit | e37c83c06c2690157a989df40dc99a6b61c9ea15 (patch) | |
| tree | 024dfb8b2c9abeec9ca7cb0c0136c276d9aacc91 /sound/soc/sh/siu.h | |
| parent | ce1f7d30766f6549db6fa0b9e595e0d26a5b7d9a (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
| download | linux-e37c83c06c2690157a989df40dc99a6b61c9ea15.tar.bz2 | |
Merge commit 'v2.6.35-rc1' into for-2.6.36
Diffstat (limited to 'sound/soc/sh/siu.h')
| -rw-r--r-- | sound/soc/sh/siu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/sh/siu.h b/sound/soc/sh/siu.h index c0bfab8fed3d..492b1cae24cc 100644 --- a/sound/soc/sh/siu.h +++ b/sound/soc/sh/siu.h @@ -71,8 +71,7 @@ struct siu_firmware { #include <linux/dmaengine.h> #include <linux/interrupt.h> #include <linux/io.h> - -#include <asm/dmaengine.h> +#include <linux/sh_dma.h> #include <sound/core.h> #include <sound/pcm.h> |