From: Frederic Leroy <fredo@starox.org>
Date: Wed, 17 Feb 2010 23:25:26 +0000 (+0100)
Subject: staging: rtl8192su: fix compile error from wireless-testing commit
X-Git-Tag: v2.6.34-rc1~233^2~88^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2117cea27c6b27e1a379acac5eb0433eeb7033a;p=pandora-kernel.git

staging: rtl8192su: fix compile error from wireless-testing commit

In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr
to include/linux/ieee80211.h. This definition collides with one that is
in the rtl8192su driver in staging.

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

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed