diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-03 23:01:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-03 23:01:54 +0100 |
| commit | 3c6c2a997743c48c3ef8abbf3400c4cf6da650fe (patch) | |
| tree | c43ad5239a47e329891861adde67ce0854061fec /sound/soc/ux500/ux500_msp_dai.c | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
| parent | 98d3088e534a2a61f6690b5426909b0c3b57a785 (diff) | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-3.6
ASoC: Additional updates for 3.6
A few updates for issues discovered during the merge window, the main
one being the fix for the issues with defaulting to use of regmap
without properly checking if there was I/O in place already.
Diffstat (limited to 'sound/soc/ux500/ux500_msp_dai.c')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 62ac0285bfa..057e28ef770 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -21,7 +21,7 @@ #include <linux/mfd/dbx500-prcmu.h> #include <mach/hardware.h> -#include <mach/board-mop500-msp.h> +#include <mach/msp.h> #include <sound/soc.h> #include <sound/soc-dai.h> |