From f544525dead56f464fa4497d5c0b4cf0ee15389e Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Fri, 21 Sep 2012 11:01:53 +1000 Subject: [PATCH] sections: fix section conflicts in sound Signed-off-by: Andi Kleen Cc: Takashi Iwai Signed-off-by: Andrew Morton --- sound/soc/codecs/wm5100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }, -- 2.39.5