diff options
-rw-r--r-- | net/mac80211/cfg.c | 2 | ||||
-rw-r--r-- | net/mac80211/cfg.h (renamed from net/mac80211/ieee80211_cfg.h) | 6 | ||||
-rw-r--r-- | net/mac80211/ieee80211.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index d6fc55cc8ad4..6981ba178e19 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <net/net_namespace.h> | 11 | #include <net/net_namespace.h> |
12 | #include <net/cfg80211.h> | 12 | #include <net/cfg80211.h> |
13 | #include "ieee80211_i.h" | 13 | #include "ieee80211_i.h" |
14 | #include "ieee80211_cfg.h" | 14 | #include "cfg.h" |
15 | 15 | ||
16 | static int ieee80211_add_iface(struct wiphy *wiphy, char *name, | 16 | static int ieee80211_add_iface(struct wiphy *wiphy, char *name, |
17 | enum nl80211_iftype type) | 17 | enum nl80211_iftype type) |
diff --git a/net/mac80211/ieee80211_cfg.h b/net/mac80211/cfg.h index 85ed2c924878..7d7879f5b00b 100644 --- a/net/mac80211/ieee80211_cfg.h +++ b/net/mac80211/cfg.h | |||
@@ -1,9 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * mac80211 configuration hooks for cfg80211 | 2 | * mac80211 configuration hooks for cfg80211 |
3 | */ | 3 | */ |
4 | #ifndef __IEEE80211_CFG_H | 4 | #ifndef __CFG_H |
5 | #define __IEEE80211_CFG_H | 5 | #define __CFG_H |
6 | 6 | ||
7 | extern struct cfg80211_ops mac80211_config_ops; | 7 | extern struct cfg80211_ops mac80211_config_ops; |
8 | 8 | ||
9 | #endif /* __IEEE80211_CFG_H */ | 9 | #endif /* __CFG_H */ |
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 4a213a20373a..89be6629cfc0 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include "wme.h" | 31 | #include "wme.h" |
32 | #include "aes_ccm.h" | 32 | #include "aes_ccm.h" |
33 | #include "ieee80211_led.h" | 33 | #include "ieee80211_led.h" |
34 | #include "ieee80211_cfg.h" | 34 | #include "cfg.h" |
35 | #include "debugfs.h" | 35 | #include "debugfs.h" |
36 | #include "debugfs_netdev.h" | 36 | #include "debugfs_netdev.h" |
37 | 37 | ||