kernel-ark/drivers/staging
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
..
altpciechdma
android
arlan Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-12-08 07:55:01 -08:00
asus_oled
b3dfg
comedi pcmcia: rework the irq_req_t typedef 2009-11-28 18:03:14 +01:00
cx25821
dream
dst
echo
et131x
frontier
go7007 V4L/DVB (13372): staging/go7007: fix mutex function usage for s2250 2009-11-30 17:49:15 -02:00
hv Staging: hv: Fix some missing author names 2009-11-30 16:39:35 -08:00
iio
line6
mimio
netwave Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2009-12-05 15:22:26 -08:00
octeon Staging: octeon-ethernet: Assign proper MAC addresses. 2009-11-23 18:55:34 +00:00
otus
p9auth
panel
phison
poch
pohmelfs writeback: remove unused nonblocking and congestion checks 2009-12-03 13:54:25 +01:00
quatech_usb2
rar
rt2860
rt2870
rt3070
rt3090
rtl8187se Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56 2010-01-14 18:16:57 -05:00
rtl8192e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
rtl8192su Staging: update TODO files 2009-11-30 16:39:42 -08:00
sep
serqt_usb2
slicoss
strip
udlfb
usbip
vme
vt6655 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-12-01 22:13:38 -08:00
vt6656 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-12-01 22:13:38 -08:00
wavelan Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2009-12-05 15:22:26 -08:00
winbond
wlan-ng
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 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
staging.c