diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-09 09:50:29 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-09 09:50:29 +0200 |
| commit | 4d0f0293b0108f751d79e5a060534fbc9575f7bb (patch) | |
| tree | 93c28176dfd2491e899d2ffb967c671abddc8ab8 /libre/linux-libre/config.x86_64 | |
| parent | 2cf785af142618fb225778622b1d94a016c18462 (diff) | |
| parent | 1fed401c439c264bd92a4c13af1bea0bea458cb4 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gawk/PKGBUILD
libre/linux-libre/PKGBUILD
staging/icu/PKGBUILD
testing/cairo/PKGBUILD
Diffstat (limited to 'libre/linux-libre/config.x86_64')
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index f36dc8cf5..454a61b84 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -2237,17 +2237,8 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_CS=m -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set CONFIG_IWLWIFI=m # |