[PATCH] USB: g_multi: Fixed '"CONFIG_USB_ETH_RNDIS" redefined' warning

[Michal Nazarewicz]

From: Michal Nazarewicz <m.nazarewicz@xxxxxxxxxxx>

CONFIG_USB_ETH_RNDIS may be defined when g_ether is built causing
warning when multi.c tries to redefine its value.  Changed to first
undefine CONFIG_USB_ETH_RNDIS in multi.c.

Signed-off-by: Michal Nazarewicz <m.nazarewicz@xxxxxxxxxxx>
---
 drivers/usb/gadget/multi.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 64711fe..227dc81 100644
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -26,6 +26,9 @@
 #include <linux/utsname.h>
 
 
+#if defined CONFIG_USB_ETH_RNDIS
+#  undef CONFIG_USB_ETH_RNDIS
+#endif
 #if defined CONFIG_USB_G_MULTI_RNDIS
 #  define CONFIG_USB_ETH_RNDIS y
 #endif
-- 
1.6.5


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/