From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 11 Oct 2011 19:33:10 +0000 (-0400)
Subject: ath6kl: fixup merge damage in ath6kl_mgmt_tx
X-Git-Tag: v3.2-rc1~129^2~104^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2;p=pandora-kernel.git

ath6kl: fixup merge damage in ath6kl_mgmt_tx

  CC [M]  drivers/net/wireless/ath/ath6kl/cfg80211.o
drivers/net/wireless/ath/ath6kl/cfg80211.c:1838:2: warning: initialization from incompatible pointer type

Caused by commit e9f935e3e8dc0bddd0df6d148165d95925422502...

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

Reading git-diff-tree failed