summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-05-25 12:49:10 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-06-11 14:28:40 -0400
commitec3eef28d9bc3fbcc5d3dd668dffcaa675015b11 (patch)
treee38058e72eebc678765f7760af3166b23007071b
parent435a1acba23437a6c8462dd8437e48cdf09a2f71 (diff)
downloadtalos-op-linux-ec3eef28d9bc3fbcc5d3dd668dffcaa675015b11.tar.gz
talos-op-linux-ec3eef28d9bc3fbcc5d3dd668dffcaa675015b11.zip
[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>
-rw-r--r--drivers/net/wireless/libertas/defs.h4
-rw-r--r--drivers/net/wireless/libertas/if_bootcmd.c2
-rw-r--r--drivers/net/wireless/libertas/if_usb.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h
index c081813410fd..b189d3bce2e8 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 567000c3e87b..c65e9f445c00 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 97469fe106fb..d87915dbe827 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"
OpenPOWER on IntegriCloud