diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 10:29:06 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 10:29:06 +0100 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /sound/soc/omap/omap-pcm.c | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
| download | linux-709334c87dbdb44150ce436b3d13c814db0dcae9.tar.bz2 | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 6a829eef2a4f..9db2770e9640 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -28,7 +28,7 @@ #include <sound/pcm_params.h> #include <sound/soc.h> -#include <mach/dma.h> +#include <plat/dma.h> #include "omap-pcm.h" static const struct snd_pcm_hardware omap_pcm_hardware = { |