diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /sound/soc/omap/omap-mcbsp.c | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 45be94201c89..6bbbd2ab0ee7 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
| @@ -31,9 +31,9 @@ | |||
| 31 | #include <sound/initval.h> | 31 | #include <sound/initval.h> |
| 32 | #include <sound/soc.h> | 32 | #include <sound/soc.h> |
| 33 | 33 | ||
| 34 | #include <mach/control.h> | 34 | #include <plat/control.h> |
| 35 | #include <mach/dma.h> | 35 | #include <plat/dma.h> |
| 36 | #include <mach/mcbsp.h> | 36 | #include <plat/mcbsp.h> |
| 37 | #include "omap-mcbsp.h" | 37 | #include "omap-mcbsp.h" |
| 38 | #include "omap-pcm.h" | 38 | #include "omap-pcm.h" |
| 39 | 39 | ||