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/omap-mcbsp.c | |
parent | b3172f222ab5afdc91ea058bd11c42cf169728f3 (diff) | |
parent | 6b7b284958d47b77d06745b36bc7f36dab769d9b (diff) |
Merge commit 'v2.6.33-rc2' into for-2.6.33
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 45be94201c8..6bbbd2ab0ee 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -31,9 +31,9 @@ #include <sound/initval.h> #include <sound/soc.h> -#include <mach/control.h> -#include <mach/dma.h> -#include <mach/mcbsp.h> +#include <plat/control.h> +#include <plat/dma.h> +#include <plat/mcbsp.h> #include "omap-mcbsp.h" #include "omap-pcm.h" |