diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-06-24 20:10:17 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-06-24 20:10:17 -0300 |
| commit | 1696b858277be08beb68a3bb9bb30984b57097a6 (patch) | |
| tree | 0b67c705956a32aca8a95cbc9c7856c7f0c025bd /libre/linux-libre/config.i686 | |
| parent | a4c5032b21eb49cb04d9b00dfb990fa9b1fa4a1c (diff) | |
| parent | 003c376c2f2d73ec9730965992d9e6364de1bceb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre/config.i686')
| -rw-r--r-- | libre/linux-libre/config.i686 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index c91f26163..f6951a2b6 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.3-1 Kernel Configuration +# Linux/x86 3.9.7-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2434,7 +2434,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -4709,7 +4709,6 @@ CONFIG_USB_MUSB_TUSB6010=m CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y # CONFIG_USB_CHIPIDEA_DEBUG is not set CONFIG_USB_RENESAS_USBHS=m |