ath6kl: fixup merge damage in ath6kl_mgmt_tx
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Oct 2011 19:33:10 +0000 (15:33 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Oct 2011 19:33:10 +0000 (15:33 -0400)
commit5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2
tree29c675e824f2346a8c81c88a6a2383d7ea96cd77
parentd6222fb0d669307a49e2a96aad86c156a9bb9551
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>
drivers/net/wireless/ath/ath6kl/cfg80211.c