diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /sound/soc/omap/ams-delta.c | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'sound/soc/omap/ams-delta.c')
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index 5a5166ac7279..3f1a6c1a0355 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c | |||
| @@ -31,8 +31,8 @@ | |||
| 31 | 31 | ||
| 32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| 33 | 33 | ||
| 34 | #include <mach/board-ams-delta.h> | 34 | #include <plat/board-ams-delta.h> |
| 35 | #include <mach/mcbsp.h> | 35 | #include <plat/mcbsp.h> |
| 36 | 36 | ||
| 37 | #include "omap-mcbsp.h" | 37 | #include "omap-mcbsp.h" |
| 38 | #include "omap-pcm.h" | 38 | #include "omap-pcm.h" |