From: Andi Kleen <ak@linux.intel.com>
Date: Wed, 26 Sep 2012 01:34:10 +0000 (+1000)
Subject: sections: fix section conflicts in sound
X-Git-Tag: next-20120926~2^2~175
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3bfa40c2c5de9375db21d0c00ba451882000cd7f;p=karo-tx-linux.git

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>
---

diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 4da1b92b22c2..7f567585832e 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 },