diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:12:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:46 +0900 |
| commit | c7fd5bc77e9dc8da74bf833d9312076a86d2823e (patch) | |
| tree | a81f336cf70133660266df8ca7744e7bd5b97524 | |
| parent | 04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa (diff) | |
| download | op-kernel-dev-c7fd5bc77e9dc8da74bf833d9312076a86d2823e.zip op-kernel-dev-c7fd5bc77e9dc8da74bf833d9312076a86d2823e.tar.gz | |
sections: fix section conflicts in sound
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | sound/soc/codecs/wm5100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index f481729..aa62c0e 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -1233,7 +1233,7 @@ static const struct snd_soc_dapm_route wm5100_dapm_routes[] = { { "PWM2", NULL, "PWM2 Driver" }, }; -static const __devinitdata struct reg_default wm5100_reva_patches[] = { +static const __devinitconst struct reg_default wm5100_reva_patches[] = { { WM5100_AUDIO_IF_1_10, 0 }, { WM5100_AUDIO_IF_1_11, 1 }, { WM5100_AUDIO_IF_1_12, 2 }, |
