From: Hauke Mehrtens Date: Sat, 11 Sep 2010 16:18:28 +0000 (-0700) Subject: compat-wireless: fix for CONFIG_WIRELESS_EXT=n X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ded58cc8db1840513ae55ffcea5cabab3f7e13ab;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: fix for CONFIG_WIRELESS_EXT=n Some modules need CONFIG_WIRELESS_EXT to be set. They should not be build if CONFIG_WIRELESS_EXT was not set. Signed-off-by: Hauke Mehrtens --- diff --git a/config.mk b/config.mk index 458de29c5252..1498573c0b65 100644 --- a/config.mk +++ b/config.mk @@ -248,11 +248,13 @@ CONFIG_B43LEGACY_LEDS=y CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y +ifdef CONFIG_WIRELESS_EXT +ifdef CONFIG_WEXT_SPY +ifdef CONFIG_WEXT_PRIV # The Intel ipws CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG=y - CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG=y @@ -274,6 +276,9 @@ CONFIG_IPW2200_QOS=y # it on via sysfs: # # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface +endif #CONFIG_WEXT_PRIV +endif #CONFIG_WEXT_SPY +endif #CONFIG_WIRELESS_EXT ifneq ($(CONFIG_SSB),) # Sonics Silicon Backplane @@ -331,6 +336,9 @@ else #CONFIG_COMPAT_KERNEL_27 CONFIG_ATL1C=m endif #CONFIG_COMPAT_KERNEL_27 +ifdef CONFIG_WIRELESS_EXT +ifdef CONFIG_WEXT_SPY +ifdef CONFIG_WEXT_PRIV CONFIG_HERMES=m CONFIG_HERMES_CACHE_FW_ON_INIT=y ifneq ($(CONFIG_PPC_PMAC),) @@ -344,6 +352,9 @@ ifneq ($(CONFIG_PCMCIA),) CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m endif +endif #CONFIG_WEXT_PRIV +endif #CONFIG_WEXT_SPY +endif #CONFIG_WIRELESS_EXT endif ## end of PCI @@ -490,6 +501,7 @@ CONFIG_BT_HCIBTSDIO=m CONFIG_BT_MRVL_SDIO=m ifneq ($(CONFIG_COMPAT_STAGING),) +ifdef CONFIG_WIRELESS_EXT CONFIG_ATH6KL_CFG80211=y CONFIG_ATH6KL_DEBUG=y # CONFIG_ATH6KL_DISABLE_TARGET_DBGLOGS is not set @@ -501,6 +513,7 @@ CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y # CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y CONFIG_ATH6K_LEGACY=m +endif #CONFIG_WIRELESS_EXT endif