diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-03-21 22:16:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-21 22:16:08 +0100 |
| commit | ca8778c45e401067cefe2abbfb8b547c30d45908 (patch) | |
| tree | c10beaf40adb2bbc6a8933f87ff9da7a5366bf42 /drivers/net/wireless/ath/ath9k/hw.c | |
| parent | 21d6a7dcbfba5e7b31f4e9d555a9be362578bfc3 (diff) | |
| parent | 2c41fab1c60b02626c8153a1806a7a1e5d62aaf1 (diff) | |
Merge branch 'linus' into x86/cleanups, to resolve conflict
Conflicts:
arch/x86/kernel/kprobes/ftrace.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index b66eeb577272..5abc2a5526ec 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -34,7 +34,6 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type); MODULE_AUTHOR("Atheros Communications"); MODULE_DESCRIPTION("Support for Atheros 802.11n wireless LAN cards."); -MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards"); MODULE_LICENSE("Dual BSD/GPL"); static void ath9k_hw_set_clockrate(struct ath_hw *ah) |