diff options
author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-07-17 05:19:48 -0300 |
---|---|---|
committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-07-17 05:19:48 -0300 |
commit | 0a32dd5aab83123487e6988ec37e7e5385c3aef6 (patch) | |
tree | 760f093c15bf512361439acc7b998f04fdd0cb5b /libre/linux-libre-lts/config.i686 | |
parent | 7d3151cb257dcb2aeacf52bad5d96041677754a2 (diff) | |
parent | 201a3a8a986287b2f54d01e7c5e4bbeba8c37040 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre-lts/config.i686')
-rw-r--r-- | libre/linux-libre-lts/config.i686 | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index a1d065a1a..47ddf3921 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -379,8 +379,8 @@ CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y +# CONFIG_MICROCODE_INTEL is not set +# CONFIG_MICROCODE_AMD is not set CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m @@ -2117,17 +2117,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_IWLAGN=m # @@ -3737,7 +3728,7 @@ CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m -CONFIG_STUB_POULSBO=m +# CONFIG_STUB_POULSBO is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y @@ -3797,7 +3788,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set |