kernel-ark/drivers/staging/rtl8187se
Larry Finger b6b1ac6937 Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56
In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr
to include/linux/ieee80211.h. This definition collides with one that is
in the r8187se driver in staging.

The conflict is resolved by changing r8187se to use the definition from
include/linuc/ieee80211.h.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2010-01-14 18:16:57 -05:00
..
ieee80211 Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56 2010-01-14 18:16:57 -05:00
Kconfig Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
Makefile Staging: rtl8187se: remove ENABLE_IPS ifdefs 2009-09-15 12:01:41 -07:00
r8180_93cx6.c
r8180_93cx6.h Staging: rtl8187se: remove CONFIG_RTL8185B ifdefs 2009-09-15 12:01:29 -07:00
r8180_core.c Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56 2010-01-14 18:16:57 -05:00
r8180_dm.c Staging: rtl8187se: remove dead code 2009-09-15 12:01:30 -07:00
r8180_dm.h Staging: rtl8187se: remove kernel version compatibility wrappers 2009-09-15 12:01:27 -07:00
r8180_hw.h Staging: rtl8187se: remove unused definitions from r8180_hw.h 2009-09-15 12:01:31 -07:00
r8180_rtl8225.h Staging: rtl8187se: merge r8180_rtl8225.c with r8180_rtl8225z2.c 2009-09-15 12:01:31 -07:00
r8180_rtl8225z2.c Staging: rtl8187se: cleanup r8180_rtl8225z2.c 2009-09-15 12:01:31 -07:00
r8180_wx.c Staging: ARRAY_SIZE changes 2009-09-15 12:02:06 -07:00
r8180_wx.h Staging: rtl8187se: remove duplicate dot11d.h and ieee80211.h includes 2009-09-15 12:01:27 -07:00
r8180.h Staging: rtl8187se: remove unused definitions from r8180.h 2009-09-15 12:01:31 -07:00
r8185b_init.c Staging: rtl8187se: remove ENABLE_IPS ifdefs 2009-09-15 12:01:41 -07:00
TODO Staging: update TODO files 2009-11-30 16:39:42 -08:00