]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f89cef0) | patch
Staging: r8187se: Fix compile error from wireless-testing commit ac52c9cf
authorLarry Finger <Larry.Finger@lwfinger.net>
Thu, 14 Jan 2010 19:13:47 +0000 (13:13 -0600)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 14 Jan 2010 23:16:57 +0000 (18:16 -0500)
commit4053befdfb7decf130786d150ee11865492891ce
tree5308805b70cedda843d20d6bb054d2d8c442a671tree | snapshot
parentf89cef0ce66e832e68c1f3bf7c14d5e1f246c263commit | diff
Staging: r8187se: Fix compile error from wireless-testing commit ac52c9cf

In wireless-testing, commit ac52c9cf 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>
drivers/staging/rtl8187se/ieee80211/ieee80211.h diff | blob | history
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c diff | blob | history
drivers/staging/rtl8187se/r8180_core.c diff | blob | history
Linux Kernel Source Tree.