From 44b4c85a05aff67bb3783c1521e09267253fd126 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 21 Feb 2011 14:31:24 -0800 Subject: [PATCH] compat-wireless: build ath9k common when no pci is available ath9k_common.ko and ath9k_hw.ko are not depending on pci or usb. This patch fixes build of ath9k_htc.ko for a kernel without pci support. Signed-off-by: Hauke Mehrtens --- config.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/config.mk b/config.mk index 08941b9cdc8e..2a1bf54e8de9 100644 --- a/config.mk +++ b/config.mk @@ -211,21 +211,14 @@ endif # mac80211 test driver CONFIG_MAC80211_HWSIM=m -# PCI Drivers -ifdef CONFIG_PCI - CONFIG_ATH5K=m -CONFIG_ATH5K_PCI=y # CONFIG_ATH5K_DEBUG=y # CONFIG_ATH5K_AHB=y CONFIG_ATH9K_HW=m -CONFIG_ATH9K=m -# Note: once ath9k_htc is added we'll have to move -# CONFIG_ATH9K_COMMON to an area that doesn't depend on PCI -# as you could then have ath9k disabled but ath9k_htc enabled. CONFIG_ATH9K_COMMON=m # CONFIG_ATH9K_DEBUGFS=y # CONFIG_ATH9K_PKTLOG=y + # Disable this to get minstrel as default, we leave the ath9k # rate control algorithm as the default for now as that is also # default upstream on the kernel. We will move this to minstrel @@ -234,6 +227,11 @@ CONFIG_ATH9K_COMMON=m # for long range considerations. CONFIG_ATH9K_RATE_CONTROL=y +# PCI Drivers +ifdef CONFIG_PCI + +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K=m CONFIG_COMPAT_IWLWIFI=m # CONFIG_IWLWIFI_DEBUG=y -- 2.30.2