From 01ba4c1915785fcd9478b3107727ac85d38069e1 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 10 May 2007 23:03:07 -0400
Subject: [PATCH] --- yaml --- r: 56245 b: refs/heads/master c:
 3ce4023275a9d65d913d738846cea4a844e24b51 h: refs/heads/master i:   56243:
 a6f8c94f249882fde8bb7f4bfd6cb8bc90949a1f v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/libertas/main.c    | 7 +++++++
 trunk/drivers/net/wireless/libertas/version.h | 7 -------
 trunk/drivers/net/wireless/libertas/wext.c    | 1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index affa51861e7c..e294138067e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dc5a29044d56912bf0d4e5cd19127f82b90c29c
+refs/heads/master: 3ce4023275a9d65d913d738846cea4a844e24b51
diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
index dcbf102a057e..b9b25ce65919 100644
--- a/trunk/drivers/net/wireless/libertas/main.c
+++ b/trunk/drivers/net/wireless/libertas/main.c
@@ -21,6 +21,13 @@
 #include "debugfs.h"
 #include "assoc.h"
 
+#define DRIVER_RELEASE_VERSION "320.p0"
+const char libertas_driver_version[] = "COMM-USB8388-" DRIVER_RELEASE_VERSION
+#ifdef  DEBUG
+    "-dbg"
+#endif
+    "";
+
 #ifdef ENABLE_PM
 static struct pm_dev *wlan_pm_dev = NULL;
 #endif
diff --git a/trunk/drivers/net/wireless/libertas/version.h b/trunk/drivers/net/wireless/libertas/version.h
index e86f65ae79b8..8b137891791f 100644
--- a/trunk/drivers/net/wireless/libertas/version.h
+++ b/trunk/drivers/net/wireless/libertas/version.h
@@ -1,8 +1 @@
-#define DRIVER_RELEASE_VERSION "320.p0"
-const char libertas_driver_version[] = "COMM-USB8388-" DRIVER_RELEASE_VERSION
-#ifdef  DEBUG
-    "-dbg"
-#endif
-    "";
-
 
diff --git a/trunk/drivers/net/wireless/libertas/wext.c b/trunk/drivers/net/wireless/libertas/wext.c
index 18629af33282..c62ffcd214c2 100644
--- a/trunk/drivers/net/wireless/libertas/wext.c
+++ b/trunk/drivers/net/wireless/libertas/wext.c
@@ -17,7 +17,6 @@
 #include "defs.h"
 #include "dev.h"
 #include "join.h"
-#include "version.h"
 #include "wext.h"
 #include "assoc.h"