Subject: linux-next: build failure after merge of the sound-asoc tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 14 Jan 2013 12:04:00 +1100

Hi all,

After merging the sound-asoc tree, today's linux-next build
(x86_64allmodconfig) failed like this:

sound/soc/codecs/ak4642.c:550:46: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__devinitconst'
sound/soc/codecs/ak4642.c:556:1: error: '__mod_of_device_table' aliased to undefined symbol 'ak4642_of_match'
sound/soc/codecs/ak4642.c:556:1: error: '__mod_of_device_table' aliased to external symbol 'ak4642_of_match'

Caused by commit bbf1453e28e4 ("ASoC: ak4642: add Device Tree support")
interacting with commit 54b956b90360 ("Remove __dev* markings from
init.h") from the driver-core.current tree.

As an aside, should ak4642_of_match be marked "const"?

I have added the following merge fix patch for today (which could be
applied to the sound-asoc tree directly - please):

From: Stephen Rothwell <[email-masked]>
Date: Mon, 14 Jan 2013 11:59:50 +1100
Subject: [PATCH] ASoC: ak4642: remove __devinitconst annotation

CONFIG_HOTPLUG is always true now and the __dev* macros have been removed.

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 sound/soc/codecs/ak4642.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index c78794d..2d03787 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -547,7 +547,7 @@ static int ak4642_i2c_remove(struct i2c_client *client)
 	return 0;
 }
 
-static struct of_device_id ak4642_of_match[] __devinitconst = {
+static struct of_device_id ak4642_of_match[] = {
 	{ .compatible = "asahi-kasei,ak4642",	.data = &soc_codec_dev_ak4642},
 	{ .compatible = "asahi-kasei,ak4643",	.data = &soc_codec_dev_ak4642},
 	{ .compatible = "asahi-kasei,ak4648",	.data = &soc_codec_dev_ak4648},
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    [email-masked]