diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-09 11:55:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-09-09 11:55:53 -0300 |
| commit | 7fb4c691ee96e9ea02b89d4fdd00c64186446d9c (patch) | |
| tree | 304036259a1c2a9192f8f15a088b15e158ba7be7 /libre/linux-libre/config.i686.3.11 | |
| parent | 851936e397e259c5b6ef12837c2b624fcd8003ec (diff) | |
| parent | 58d1f1eb75d3b2e65cd2ed341bc7811775befcef (diff) | |
| download | abslibre-7fb4c691ee96e9ea02b89d4fdd00c64186446d9c.tar.gz abslibre-7fb4c691ee96e9ea02b89d4fdd00c64186446d9c.tar.bz2 abslibre-7fb4c691ee96e9ea02b89d4fdd00c64186446d9c.zip | |
Merge branch 'master' of vparabola:abslibre
Diffstat (limited to 'libre/linux-libre/config.i686.3.11')
| -rw-r--r-- | libre/linux-libre/config.i686.3.11 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/linux-libre/config.i686.3.11 b/libre/linux-libre/config.i686.3.11 index 2e3c074e7..d8b8f5121 100644 --- a/libre/linux-libre/config.i686.3.11 +++ b/libre/linux-libre/config.i686.3.11 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.11.0-rc5 Kernel Configuration +# Linux/x86 3.11.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2504,7 +2504,7 @@ CONFIG_WIL6210_ISR_COR=y CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m # CONFIG_ATH10K_DEBUG is not set -CONFIG_ATH10K_DEBUGFS=y +CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_TRACING is not set CONFIG_B43=m CONFIG_B43_BCMA=y |