diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-27 10:27:19 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-27 10:27:19 +0200 |
commit | 8f4b5ed938071262638928deaf18552040360f4a (patch) | |
tree | 2352258b6acc18ac31d5480c1706131e98a36241 /target/linux/config | |
parent | 63c6929d36e5b5802c0983932a3d69e23f330bb5 (diff) | |
parent | 82fe4e6759930f69f6ae08cf85f74ae233c6bab9 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
-rw-r--r-- | target/linux/config/Config.in.flash | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.netdevice | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 1ca289b75..91cfc9140 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -44,7 +44,7 @@ config ADK_KERNEL_MTD_AR7_PARTS config ADK_KERNEL_MTD_CFI_INTELEXT boolean - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54G + default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX default n config ADK_TARGET_NAND diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index bbd2990e9..082343a14 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -115,8 +115,7 @@ config ADK_KERNEL_B44 select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54G - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54GS + default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX default n help @@ -345,6 +344,7 @@ config ADK_KPACKAGE_KMOD_B43 prompt "kmod-b43..................... Broadcom B43xx wireless cards" tristate select ADK_KPACKAGE_KMOD_FW_LOADER + select ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI default n help |