From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 10 Jun 2008 17:31:23 +0000 (-0400)
Subject: net/mac80211/ieee80211_i.h: fix-up merge damage
X-Git-Tag: v2.6.27-rc1~969^2~334
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a727a250c676334efdcb71a5b2ad4603addda06;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed