Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[~andy/linux] / net / mac80211 / debugfs_sta.c

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index f7c717c906dc1a7f777c46e73bb3f6ccf7ae9bc5..8f5944c53d4e36166cbf09c0afce26e8e6392c76 100644 (file)
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -61,7 +61,6 @@ static const struct file_operations sta_ ##name## _ops = {            \
 
 STA_FILE(aid, aid, D);
 STA_FILE(dev, dev->name, S);
-STA_FILE(vlan_id, vlan_id, D);
 STA_FILE(rx_packets, rx_packets, LU);
 STA_FILE(tx_packets, tx_packets, LU);
 STA_FILE(rx_bytes, rx_bytes, LU);