diff options
| author |   Tony Lindgren <tony@atomide.com> | 2009-11-22 10:08:43 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 10:08:43 -0800 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /sound/soc/omap/osk5912.c | |
| parent | Linux 2.6.32-rc8 (diff) | |
| parent | Merge branch 'pm-upstream/pm-cpuidle' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into 7xx-iosplit-plat-merge (diff) | |
| download | linux-dev-a76df42a675c9936e8bf3607226e74c8a5e2d847.tar.xz linux-dev-a76df42a675c9936e8bf3607226e74c8a5e2d847.zip | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'sound/soc/omap/osk5912.c')
| -rw-r--r-- | sound/soc/omap/osk5912.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index a4e149b7f0eb..498ca2e03519 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c @@ -31,7 +31,7 @@ #include <asm/mach-types.h> #include <mach/hardware.h> #include <linux/gpio.h> -#include <mach/mcbsp.h> +#include <plat/mcbsp.h> #include "omap-mcbsp.h" #include "omap-pcm.h" |