diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-08-29 10:01:45 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-08-29 10:01:45 -0300 |
commit | 7b5f5a5e83341d02f22816d9b4c0494703c3b094 (patch) | |
tree | ed96bfcb5991585c85e097c2764bd62bb5aedf50 /kernels/linux-libre-rt/config.i686 | |
parent | 0b1f916eefc5e12d52c0e9b52d9c1505b0748dfd (diff) | |
parent | 7a1ce582d431ebee67c93c4b15dc62d9cd4bbb54 (diff) | |
download | abslibre-7b5f5a5e83341d02f22816d9b4c0494703c3b094.tar.gz abslibre-7b5f5a5e83341d02f22816d9b4c0494703c3b094.tar.bz2 abslibre-7b5f5a5e83341d02f22816d9b4c0494703c3b094.zip |
Merge branch 'master' of vparabola:abslibre
Diffstat (limited to 'kernels/linux-libre-rt/config.i686')
-rw-r--r-- | kernels/linux-libre-rt/config.i686 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index c19bc2f10..8b98c58a5 100644 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.5-1 Kernel Configuration +# Linux/x86 3.10.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1630,7 +1630,7 @@ CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set -CONFIG_HWLAT_DETECTOR=m +# CONFIG_HWLAT_DETECTOR is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m CONFIG_SGI_IOC4=m |