From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 9 Nov 2005 16:34:36 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.15-rc1~69
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a7c243b544c0e9f6775c2607decaa59d54fb9e11;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
---

a7c243b544c0e9f6775c2607decaa59d54fb9e11
diff --cc drivers/net/wireless/ipw2200.c
index 589aef8ba4e,136884cef90..b0d195d1721
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@@ -31,13 -31,14 +31,15 @@@
  ******************************************************************************/
  
  #include "ipw2200.h"
 +#include <linux/version.h>
  
- #define IPW2200_VERSION "1.0.0"
+ #define IPW2200_VERSION "git-1.0.8"
  #define DRV_DESCRIPTION	"Intel(R) PRO/Wireless 2200/2915 Network Driver"
- #define DRV_COPYRIGHT	"Copyright(c) 2003-2004 Intel Corporation"
+ #define DRV_COPYRIGHT	"Copyright(c) 2003-2005 Intel Corporation"
  #define DRV_VERSION     IPW2200_VERSION
  
+ #define ETH_P_80211_STATS (ETH_P_80211_RAW + 1)
+ 
  MODULE_DESCRIPTION(DRV_DESCRIPTION);
  MODULE_VERSION(DRV_VERSION);
  MODULE_AUTHOR(DRV_COPYRIGHT);