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

[Stephen Rothwell]

Hi all,

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

In file included from sound/soc/codecs/max98357a.c:15:0:
include/linux/module.h:138:40: error: '__mod_of__max98357a_device_id_device_table' aliased to undefined symbol 'max98357a_device_id'
   extern const struct type##_device_id __mod_##type##__##name##_device_table \
                                        ^
sound/soc/codecs/max98357a.c:138:1: note: in expansion of macro 'MODULE_DEVICE_TABLE'
 MODULE_DEVICE_TABLE(of, max98357a_device_id);
 ^

Caused by commit af5adf129369 ("ASoC: max98357a: Add MAX98357A codec driver").

I have added the following fix patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 9 Feb 2015 14:34:40 +1100
Subject: [PATCH] ASoC: max98357a: fix !CONFIG_OF build

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 sound/soc/codecs/max98357a.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c
index 98b915314d7a..ac169f9f4329 100644
--- a/sound/soc/codecs/max98357a.c
+++ b/sound/soc/codecs/max98357a.c
@@ -135,4 +135,6 @@ module_platform_driver(max98357a_platform_driver);
 MODULE_DESCRIPTION("Maxim MAX98357A Codec Driver");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRV_NAME);
+#ifdef CONFIG_OF
 MODULE_DEVICE_TABLE(of, max98357a_device_id);
+#endif
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgplJKPclBkWf.pgp
Description: OpenPGP digital signature