linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/gdm724x/built-in.o: In function `netlink_init':
(.text+0x19b6): multiple definition of `netlink_init'
drivers/staging/gdm72xx/built-in.o:(.text+0x19d5): first defined here
drivers/staging/gdm724x/built-in.o: In function `netlink_exit':
(.text+0x1a2a): multiple definition of `netlink_exit'
drivers/staging/gdm72xx/built-in.o:(.text+0x1a49): first defined here
drivers/staging/gdm724x/built-in.o: In function `netlink_send':
(.text+0x1a4f): multiple definition of `netlink_send'
drivers/staging/gdm72xx/built-in.o:(.text+0x1a67): first defined here

Presumably caused by commit 61e121047645 ("staging: gdm7240: adding LTE
USB driver").  I disabled this driver using this patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 25 Jul 2013 13:16:30 +1000
Subject: [PATCH] staging: disable the gdm724x driver due to build problems

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/staging/gdm724x/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/gdm724x/Kconfig b/drivers/staging/gdm724x/Kconfig
index 10f7be1..85141bd 100644
--- a/drivers/staging/gdm724x/Kconfig
+++ b/drivers/staging/gdm724x/Kconfig
@@ -5,6 +5,7 @@
 config LTE_GDM724X
 	tristate "GCT GDM724x LTE support"
 	depends on NET && USB
+	depends on BROKEN
 	help
 	  This driver supports GCT GDM724x LTE chip based USB modem devices.
 	  It exposes 4 network devices to be used per PDN and 2 tty devices to be
-- 
1.8.3.3


-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature