From e85ef609454bea47d51bab0b600f1a4f4efaa2c1 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Thu, 13 Apr 2006 17:20:34 +0800
Subject: [PATCH] --- yaml --- r: 27295 b: refs/heads/master c:
 ae4af61f6d9909f3c3ab74694c06865f27c9b054 h: refs/heads/master i:   27293:
 0dce16731df1d7a08f776794f7f6073cd34cc6e5   27291:
 5799d632f7f7ab6e21f6084c0d6f60b012e558d4   27287:
 225dd122eb7b6e3c55a30343223d5bda22aa77c3   27279:
 609cc267a054d6178527dad6d2a9e4eaa2d81c7b   27263:
 336ee73459127e13271a001e4e0c2e73ad927437 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/wireless/ipw2200.c | 39 +++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c9d476ec25a1..7c84bb8cdf0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d685b8c226727bf5db907c7241f55461e7f1f008
+refs/heads/master: ae4af61f6d9909f3c3ab74694c06865f27c9b054
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index 94172558cd03..d4f5cce8fb2f 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/drivers/net/wireless/ipw2200.c
@@ -33,7 +33,44 @@
 #include "ipw2200.h"
 #include <linux/version.h>
 
-#define IPW2200_VERSION "git-1.1.1"
+
+#ifndef KBUILD_EXTMOD
+#define VK "k"
+#else
+#define VK
+#endif
+
+#ifdef CONFIG_IPW2200_DEBUG
+#define VD "d"
+#else
+#define VD
+#endif
+
+#ifdef CONFIG_IPW2200_MONITOR
+#define VM "m"
+#else
+#define VM
+#endif
+
+#ifdef CONFIG_IPW2200_PROMISCUOUS
+#define VP "p"
+#else
+#define VP
+#endif
+
+#ifdef CONFIG_IEEE80211_RADIOTAP
+#define VR "r"
+#else
+#define VR
+#endif
+
+#ifdef CONFIG_IPW2200_QOS
+#define VQ "q"
+#else
+#define VQ
+#endif
+
+#define IPW2200_VERSION "1.1.1" VK VD VM VP VR VQ
 #define DRV_DESCRIPTION	"Intel(R) PRO/Wireless 2200/2915 Network Driver"
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2006 Intel Corporation"
 #define DRV_VERSION     IPW2200_VERSION