diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 14:52:54 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 14:52:54 +0000 |
commit | 7f50548abb5454bd82c25aae15f0a3bf6a530f46 (patch) | |
tree | 175b5d695437151f0f9f778ad8eb7f274468842f /sound/soc/omap/n810.c | |
parent | b3172f222ab5afdc91ea058bd11c42cf169728f3 (diff) | |
parent | 6b7b284958d47b77d06745b36bc7f36dab769d9b (diff) | |
download | kernel_samsung_tuna-7f50548abb5454bd82c25aae15f0a3bf6a530f46.zip kernel_samsung_tuna-7f50548abb5454bd82c25aae15f0a3bf6a530f46.tar.gz kernel_samsung_tuna-7f50548abb5454bd82c25aae15f0a3bf6a530f46.tar.bz2 |
Merge commit 'v2.6.33-rc2' into for-2.6.33
Diffstat (limited to 'sound/soc/omap/n810.c')
-rw-r--r-- | sound/soc/omap/n810.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 0a50593..08e09d7 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -32,7 +32,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" |