From: Larry Finger Date: Thu, 14 Jan 2010 19:13:47 +0000 (-0600) Subject: Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56 X-Git-Tag: v2.6.34-rc1~233^2~556^2~38 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b1ac69372da996f40863358df41ca77075b249;p=pandora-kernel.git 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 Signed-off-by: John W. Linville --- Reading git-diff-tree failed