diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
| commit | 5861b2783c0615345b80a93470312b36d1cb9907 (patch) | |
| tree | 42ded4821e0834063449a5620a1b46bc6f1e509b /target/linux/config/Config.in.netdevice | |
| parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
| parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) | |
fix conflict
Diffstat (limited to 'target/linux/config/Config.in.netdevice')
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index b615156f9..a3ff2c6c1 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -309,6 +309,7 @@ config ADK_KERNEL_MOD_CFG80211 tristate config ADK_KERNEL_MOD_LIB80211 + select ADK_KPACKAGE_KMOD_CRYPTO_MICHAEL_MIC tristate config ADK_KERNEL_CFG80211_WEXT @@ -348,7 +349,7 @@ config ADK_DEBUG_MAC80211 select ADK_KERNEL_DEBUG_FS menu "Wireless card support" -depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_AHB +depends on ADK_TARGET_WITH_CARDBUS || ADK_TARGET_WITH_PCMCIA || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_AHB config ADK_KPACKAGE_KMOD_ATH5K prompt "kmod-ath5k................... Atheros 5xxx wireless cards" @@ -404,11 +405,30 @@ config ADK_KPACKAGE_KMOD_B43LEGACY help Driver for Broadcom B43xx wireless chips. +config ADK_KPACKAGE_KMOD_HOSTAP + prompt "kmod-hostap................... HostAP driver" + tristate + select ADK_KPACKAGE_KMOD_MAC80211 + default n + help + HostAP Driver for wireless chips. + +config ADK_KPACKAGE_KMOD_HOSTAP_CS + prompt "kmod-hostap-cs................ HostAP driver for PC Cards" + tristate + depends on ADK_KPACKAGE_KMOD_HOSTAP + default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default n + help + HostAP CS Driver for wireless chips. + config ADK_KPACKAGE_KMOD_RTL8187 prompt "kmod-rtl8187................. Realtek RTL8187/RTL8187B wireless cards" tristate depends on ADK_TARGET_WITH_USB depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX + select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KPACKAGE_KMOD_EEPROM_93CX6 default n help Driver for Realtek RTL8187/RTL8187B wireless chips. |