diff options
Diffstat (limited to 'drivers')
18 files changed, 20 insertions, 20 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile index 40ba46b4809d..dc4c75083085 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile +++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile | |||
| @@ -31,7 +31,7 @@ brcmfmac-objs += \ | |||
| 31 | p2p.o \ | 31 | p2p.o \ |
| 32 | proto.o \ | 32 | proto.o \ |
| 33 | common.o \ | 33 | common.o \ |
| 34 | dhd_linux.o \ | 34 | core.o \ |
| 35 | firmware.o \ | 35 | firmware.o \ |
| 36 | feature.o \ | 36 | feature.o \ |
| 37 | btcoex.o \ | 37 | btcoex.o \ |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c index d5a2d94ffde4..8e0e91c4a0b1 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <brcmu_utils.h> | 25 | #include <brcmu_utils.h> |
| 26 | #include <brcmu_wifi.h> | 26 | #include <brcmu_wifi.h> |
| 27 | 27 | ||
| 28 | #include "dhd.h" | 28 | #include "core.h" |
| 29 | #include "bus.h" | 29 | #include "bus.h" |
| 30 | #include "fwsignal.h" | 30 | #include "fwsignal.h" |
| 31 | #include "debug.h" | 31 | #include "debug.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/btcoex.c b/drivers/net/wireless/brcm80211/brcmfmac/btcoex.c index e324414fcf6d..0445163991b7 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/btcoex.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <brcmu_wifi.h> | 20 | #include <brcmu_wifi.h> |
| 21 | #include <brcmu_utils.h> | 21 | #include <brcmu_utils.h> |
| 22 | #include <defs.h> | 22 | #include <defs.h> |
| 23 | #include <dhd.h> | 23 | #include "core.h" |
| 24 | #include "debug.h" | 24 | #include "debug.h" |
| 25 | #include "fwil.h" | 25 | #include "fwil.h" |
| 26 | #include "fwil_types.h" | 26 | #include "fwil_types.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c index 0390e57613cd..8822f2b8d74d 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <brcmu_utils.h> | 26 | #include <brcmu_utils.h> |
| 27 | #include <defs.h> | 27 | #include <defs.h> |
| 28 | #include <brcmu_wifi.h> | 28 | #include <brcmu_wifi.h> |
| 29 | #include "dhd.h" | 29 | #include "core.h" |
| 30 | #include "debug.h" | 30 | #include "debug.h" |
| 31 | #include "tracepoint.h" | 31 | #include "tracepoint.h" |
| 32 | #include "fwil_types.h" | 32 | #include "fwil_types.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/common.c b/drivers/net/wireless/brcm80211/brcmfmac/common.c index 75642e46c37a..183cec9939ea 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/common.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/netdevice.h> | 19 | #include <linux/netdevice.h> |
| 20 | #include <brcmu_wifi.h> | 20 | #include <brcmu_wifi.h> |
| 21 | #include <brcmu_utils.h> | 21 | #include <brcmu_utils.h> |
| 22 | #include "dhd.h" | 22 | #include "core.h" |
| 23 | #include "bus.h" | 23 | #include "bus.h" |
| 24 | #include "debug.h" | 24 | #include "debug.h" |
| 25 | #include "fwil.h" | 25 | #include "fwil.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/commonring.c b/drivers/net/wireless/brcm80211/brcmfmac/commonring.c index c6d65b8e1e15..77656c711bed 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/commonring.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/commonring.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <brcmu_utils.h> | 19 | #include <brcmu_utils.h> |
| 20 | #include <brcmu_wifi.h> | 20 | #include <brcmu_wifi.h> |
| 21 | 21 | ||
| 22 | #include "dhd.h" | 22 | #include "core.h" |
| 23 | #include "commonring.h" | 23 | #include "commonring.h" |
| 24 | 24 | ||
| 25 | 25 | ||
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/core.c index 53650b9cb768..f407665cb1ea 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <brcmu_utils.h> | 22 | #include <brcmu_utils.h> |
| 23 | #include <brcmu_wifi.h> | 23 | #include <brcmu_wifi.h> |
| 24 | 24 | ||
| 25 | #include "dhd.h" | 25 | #include "core.h" |
| 26 | #include "bus.h" | 26 | #include "bus.h" |
| 27 | #include "debug.h" | 27 | #include "debug.h" |
| 28 | #include "fwil_types.h" | 28 | #include "fwil_types.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/core.h index 5e4317dbc2b0..7df22bdb19a2 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/core.h | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | * Common types * | 18 | * Common types * |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #ifndef _BRCMF_H_ | 21 | #ifndef BRCMFMAC_CORE_H |
| 22 | #define _BRCMF_H_ | 22 | #define BRCMFMAC_CORE_H |
| 23 | 23 | ||
| 24 | #include "fweh.h" | 24 | #include "fweh.h" |
| 25 | 25 | ||
| @@ -186,4 +186,4 @@ void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb); | |||
| 186 | /* Sets dongle media info (drv_version, mac address). */ | 186 | /* Sets dongle media info (drv_version, mac address). */ |
| 187 | int brcmf_c_preinit_dcmds(struct brcmf_if *ifp); | 187 | int brcmf_c_preinit_dcmds(struct brcmf_if *ifp); |
| 188 | 188 | ||
| 189 | #endif /* _BRCMF_H_ */ | 189 | #endif /* BRCMFMAC_CORE_H */ |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/debug.c b/drivers/net/wireless/brcm80211/brcmfmac/debug.c index 340b10447ab9..9b473d50b005 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/debug.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <brcmu_wifi.h> | 20 | #include <brcmu_wifi.h> |
| 21 | #include <brcmu_utils.h> | 21 | #include <brcmu_utils.h> |
| 22 | #include "dhd.h" | 22 | #include "core.h" |
| 23 | #include "bus.h" | 23 | #include "bus.h" |
| 24 | #include "debug.h" | 24 | #include "debug.h" |
| 25 | 25 | ||
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/brcm80211/brcmfmac/feature.c index d4be4c416912..931f68aefaa4 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/feature.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #include <linux/netdevice.h> | 17 | #include <linux/netdevice.h> |
| 18 | 18 | ||
| 19 | #include <brcm_hw_ids.h> | 19 | #include <brcm_hw_ids.h> |
| 20 | #include "dhd.h" | 20 | #include "core.h" |
| 21 | #include "bus.h" | 21 | #include "bus.h" |
| 22 | #include "debug.h" | 22 | #include "debug.h" |
| 23 | #include "fwil.h" | 23 | #include "fwil.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/flowring.c b/drivers/net/wireless/brcm80211/brcmfmac/flowring.c index e9cb550f5c5a..44f3a84d1999 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/flowring.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/flowring.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/etherdevice.h> | 19 | #include <linux/etherdevice.h> |
| 20 | #include <brcmu_utils.h> | 20 | #include <brcmu_utils.h> |
| 21 | 21 | ||
| 22 | #include "dhd.h" | 22 | #include "core.h" |
| 23 | #include "debug.h" | 23 | #include "debug.h" |
| 24 | #include "bus.h" | 24 | #include "bus.h" |
| 25 | #include "proto.h" | 25 | #include "proto.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c index ce98ce55685b..7338b335e153 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include "brcmu_wifi.h" | 18 | #include "brcmu_wifi.h" |
| 19 | #include "brcmu_utils.h" | 19 | #include "brcmu_utils.h" |
| 20 | 20 | ||
| 21 | #include "dhd.h" | 21 | #include "core.h" |
| 22 | #include "debug.h" | 22 | #include "debug.h" |
| 23 | #include "tracepoint.h" | 23 | #include "tracepoint.h" |
| 24 | #include "fwsignal.h" | 24 | #include "fwsignal.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c index 70db41f51b7b..51f88c11e642 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/netdevice.h> | 22 | #include <linux/netdevice.h> |
| 23 | #include <brcmu_utils.h> | 23 | #include <brcmu_utils.h> |
| 24 | #include <brcmu_wifi.h> | 24 | #include <brcmu_wifi.h> |
| 25 | #include "dhd.h" | 25 | #include "core.h" |
| 26 | #include "bus.h" | 26 | #include "bus.h" |
| 27 | #include "debug.h" | 27 | #include "debug.h" |
| 28 | #include "tracepoint.h" | 28 | #include "tracepoint.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c index 6d33331dd2b0..f0dda0ecd23b 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <brcmu_utils.h> | 27 | #include <brcmu_utils.h> |
| 28 | #include <brcmu_wifi.h> | 28 | #include <brcmu_wifi.h> |
| 29 | #include "dhd.h" | 29 | #include "core.h" |
| 30 | #include "debug.h" | 30 | #include "debug.h" |
| 31 | #include "bus.h" | 31 | #include "bus.h" |
| 32 | #include "fwil.h" | 32 | #include "fwil.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c index 18e1770b8d8c..02d39ce8dbca 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <brcmu_utils.h> | 24 | #include <brcmu_utils.h> |
| 25 | #include <brcmu_wifi.h> | 25 | #include <brcmu_wifi.h> |
| 26 | 26 | ||
| 27 | #include "dhd.h" | 27 | #include "core.h" |
| 28 | #include "debug.h" | 28 | #include "debug.h" |
| 29 | #include "proto.h" | 29 | #include "proto.h" |
| 30 | #include "msgbuf.h" | 30 | #include "msgbuf.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c index ae504b40e554..effb48ebd864 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <brcmu_wifi.h> | 21 | #include <brcmu_wifi.h> |
| 22 | #include <brcmu_utils.h> | 22 | #include <brcmu_utils.h> |
| 23 | #include <defs.h> | 23 | #include <defs.h> |
| 24 | #include <dhd.h> | 24 | #include "core.h" |
| 25 | #include "debug.h" | 25 | #include "debug.h" |
| 26 | #include "fwil.h" | 26 | #include "fwil.h" |
| 27 | #include "fwil_types.h" | 27 | #include "fwil_types.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/proto.c b/drivers/net/wireless/brcm80211/brcmfmac/proto.c index 5e83b2bee9d8..26b68c367f57 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/proto.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/proto.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/netdevice.h> | 20 | #include <linux/netdevice.h> |
| 21 | 21 | ||
| 22 | #include <brcmu_wifi.h> | 22 | #include <brcmu_wifi.h> |
| 23 | #include "dhd.h" | 23 | #include "core.h" |
| 24 | #include "bus.h" | 24 | #include "bus.h" |
| 25 | #include "debug.h" | 25 | #include "debug.h" |
| 26 | #include "proto.h" | 26 | #include "proto.h" |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/vendor.c b/drivers/net/wireless/brcm80211/brcmfmac/vendor.c index b86a08369517..222f26a39642 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/vendor.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/vendor.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <brcmu_wifi.h> | 21 | #include <brcmu_wifi.h> |
| 22 | #include "fwil_types.h" | 22 | #include "fwil_types.h" |
| 23 | #include "dhd.h" | 23 | #include "core.h" |
| 24 | #include "p2p.h" | 24 | #include "p2p.h" |
| 25 | #include "debug.h" | 25 | #include "debug.h" |
| 26 | #include "cfg80211.h" | 26 | #include "cfg80211.h" |
