| commit | b6b1ac69372da996f40863358df41ca77075b249 | [log] [tgz] |
|---|---|---|
| author | Larry Finger <Larry.Finger@lwfinger.net> | Thu Jan 14 13:13:47 2010 -0600 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Jan 14 18:16:57 2010 -0500 |
| tree | 5308805b70cedda843d20d6bb054d2d8c442a671 | |
| parent | a0f2e0fca1e72c1de07e834be05b61d33842253e [diff] |
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>