diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-02 20:11:25 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-02 20:11:25 +0400 |
| commit | ac190c76680cde6ce379b6be5baf89a970ea13d4 (patch) | |
| tree | 8708121cda4180ac9e5c89f5473a8d6f10fda711 /sound/soc/ux500/ux500_msp_dai.c | |
| parent | 707fba3fa76a4c8855552f5d4c1a12430c09bce8 (diff) | |
| parent | 98d3088e534a2a61f6690b5426909b0c3b57a785 (diff) | |
| download | linux-ac190c76680cde6ce379b6be5baf89a970ea13d4.tar.xz | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
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 62ac0285bfaf..057e28ef770e 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> |