diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2007-05-25 12:49:10 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-06-11 14:28:40 -0400 |
commit | ec3eef28d9bc3fbcc5d3dd668dffcaa675015b11 (patch) | |
tree | e38058e72eebc678765f7760af3166b23007071b | |
parent | 435a1acba23437a6c8462dd8437e48cdf09a2f71 (diff) |
[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.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_bootcmd.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 2 |
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 @@ | |||
12 | #define PROC_DEBUG | 12 | #define PROC_DEBUG |
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | #define DRV_NAME "usb8xxx" | 15 | #ifndef DRV_NAME |
16 | #define DRV_NAME "libertas" | ||
17 | #endif | ||
16 | 18 | ||
17 | 19 | ||
18 | #define LBS_DEB_ENTER 0x00000001 | 20 | #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 @@ | |||
8 | #include <linux/netdevice.h> | 8 | #include <linux/netdevice.h> |
9 | #include <linux/usb.h> | 9 | #include <linux/usb.h> |
10 | 10 | ||
11 | #define DRV_NAME "usb8xxx" | ||
12 | |||
11 | #include "defs.h" | 13 | #include "defs.h" |
12 | #include "dev.h" | 14 | #include "dev.h" |
13 | #include "if_usb.h" | 15 | #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 @@ | |||
8 | #include <linux/list.h> | 8 | #include <linux/list.h> |
9 | #include <linux/usb.h> | 9 | #include <linux/usb.h> |
10 | 10 | ||
11 | #define DRV_NAME "usb8xxx" | ||
12 | |||
11 | #include "host.h" | 13 | #include "host.h" |
12 | #include "decl.h" | 14 | #include "decl.h" |
13 | #include "defs.h" | 15 | #include "defs.h" |