From: Holger Schurig <hs4233@mail.mn-solutions.de>
Date: Fri, 25 May 2007 16:49:10 +0000 (-0400)
Subject: [PATCH] libertas: let DRV_NAME be overridable
X-Git-Tag: v2.6.22-rc5~44^2~2^2~43
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ec3eef28d9bc3fbcc5d3dd668dffcaa675015b11;p=linux-2.6-omap-h63xx.git

[PATCH] libertas: let DRV_NAME be overridable

For now, it's "libertas" by default, but that is overwritten in
if_usb.c/if_bootcmd.c and in if_cs.c.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h
index c081813410f..b189d3bce2e 100644
--- a/drivers/net/wireless/libertas/defs.h
+++ b/drivers/net/wireless/libertas/defs.h
@@ -12,7 +12,9 @@
 #define PROC_DEBUG
 #endif
 
-#define DRV_NAME "usb8xxx"
+#ifndef DRV_NAME
+#define DRV_NAME "libertas"
+#endif
 
 
 #define LBS_DEB_ENTER	0x00000001
diff --git a/drivers/net/wireless/libertas/if_bootcmd.c b/drivers/net/wireless/libertas/if_bootcmd.c
index 567000c3e87..c65e9f445c0 100644
--- a/drivers/net/wireless/libertas/if_bootcmd.c
+++ b/drivers/net/wireless/libertas/if_bootcmd.c
@@ -8,6 +8,8 @@
 #include <linux/netdevice.h>
 #include <linux/usb.h>
 
+#define DRV_NAME "usb8xxx"
+
 #include "defs.h"
 #include "dev.h"
 #include "if_usb.h"
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 97469fe106f..d87915dbe82 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -8,6 +8,8 @@
 #include <linux/list.h>
 #include <linux/usb.h>
 
+#define DRV_NAME "usb8xxx"
+
 #include "host.h"
 #include "decl.h"
 #include "defs.h"