aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wu <flamingice@sourmilk.net>2007-09-18 17:29:21 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:52:34 -0700
commite0eb68596232788bc352368f2fbc3cb088e42e41 (patch)
tree0cba5b7f58a3d9a842b5c8890dbd2d472f5da662
parentd86ec781ef9627a3fcd64a7a91d1b79a74d3927b (diff)
[MAC80211]: rename ieee80211_cfg.h to cfg.h
Might as well rename ieee80211_cfg.h to cfg.h to keep things consistent. Signed-off-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/mac80211/cfg.c2
-rw-r--r--net/mac80211/cfg.h (renamed from net/mac80211/ieee80211_cfg.h)6
-rw-r--r--net/mac80211/ieee80211.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d6fc55cc8ad..6981ba178e1 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -11,7 +11,7 @@
#include <net/net_namespace.h>
#include <net/cfg80211.h>
#include "ieee80211_i.h"
-#include "ieee80211_cfg.h"
+#include "cfg.h"
static int ieee80211_add_iface(struct wiphy *wiphy, char *name,
enum nl80211_iftype type)
diff --git a/net/mac80211/ieee80211_cfg.h b/net/mac80211/cfg.h
index 85ed2c92487..7d7879f5b00 100644
--- a/net/mac80211/ieee80211_cfg.h
+++ b/net/mac80211/cfg.h
@@ -1,9 +1,9 @@
/*
* mac80211 configuration hooks for cfg80211
*/
-#ifndef __IEEE80211_CFG_H
-#define __IEEE80211_CFG_H
+#ifndef __CFG_H
+#define __CFG_H
extern struct cfg80211_ops mac80211_config_ops;
-#endif /* __IEEE80211_CFG_H */
+#endif /* __CFG_H */
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 4a213a20373..89be6629cfc 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -31,7 +31,7 @@
#include "wme.h"
#include "aes_ccm.h"
#include "ieee80211_led.h"
-#include "ieee80211_cfg.h"
+#include "cfg.h"
#include "debugfs.h"
#include "debugfs_netdev.h"