]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
net/mac80211/ieee80211_i.h: fix-up merge damage
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Jun 2008 17:31:23 +0000 (13:31 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Jun 2008 17:31:23 +0000 (13:31 -0400)
commit9a727a250c676334efdcb71a5b2ad4603addda06
tree62f27ac1dec813a9f404110654cce4a7b5b7b7a5
parentcb14cb791c57b45ba32c92b041420cdc1b1a0283
net/mac80211/ieee80211_i.h: fix-up merge damage

These definitions were originally removed in "mac80211: remove channel
use statistics".

Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ieee80211_i.h