diff options
author | Esteban Carnevale <alfplayer@mailoo.org> | 2014-10-11 21:32:27 -0300 |
---|---|---|
committer | Esteban Carnevale <alfplayer@mailoo.org> | 2014-10-11 21:32:27 -0300 |
commit | 73878e9f6a2b86ebf66cf87ec145dc309c8520c4 (patch) | |
tree | add2354a374b3acde8a673f9250c3ff8d72d86dd /kernels/linux-libre-rt/config.i686 | |
parent | d2556ce4d528b6a62d31b9f28cd37678f565f956 (diff) | |
parent | 4e75bcf04fa2ee23cbdc320bdf04af821616a6ee (diff) | |
download | abslibre-73878e9f6a2b86ebf66cf87ec145dc309c8520c4.tar.gz abslibre-73878e9f6a2b86ebf66cf87ec145dc309c8520c4.tar.bz2 abslibre-73878e9f6a2b86ebf66cf87ec145dc309c8520c4.zip |
Merge branch 'master' of git://projects.parabola.nu/abslibre
Diffstat (limited to 'kernels/linux-libre-rt/config.i686')
-rw-r--r-- | kernels/linux-libre-rt/config.i686 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index 4147857bd..44eebb072 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.14.17-gnu-rt9-2-rt Kernel Configuration +# Linux/x86 3.14.20-gnu-rt9-1-rt Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1641,8 +1641,8 @@ CONFIG_OF_MDIO=m CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y CONFIG_OF_MTD=y -CONFIG_PARPORT=m CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m # CONFIG_PARPORT_PC_FIFO is not set @@ -4141,6 +4141,7 @@ CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) |