diff options
| author | Aurélien DESBRIÈRES <aurelien@hackers.camp> | 2014-06-15 15:36:03 +0200 |
|---|---|---|
| committer | Aurélien DESBRIÈRES <aurelien@hackers.camp> | 2014-06-15 15:36:03 +0200 |
| commit | 1cba978702feff9a523baa185796f520602baffe (patch) | |
| tree | 7c9a85ba36d7896ec67319c218cad52cafce877e /libre/linux-libre-lts/config.i686 | |
| parent | 6ca2416b334e0bed864cc0707ff361fd585829f0 (diff) | |
| parent | f7fd1d99d87f11c41cf09f881b1aeb950a3c8e13 (diff) | |
Merge branch 'master' of ssh://parabola-git/srv/git/abslibre/abslibre
Diffstat (limited to 'libre/linux-libre-lts/config.i686')
| -rw-r--r-- | libre/linux-libre-lts/config.i686 | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 942c1a052..11293a2bd 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.15-1 Kernel Configuration +# Linux/x86 3.10.43 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1718,7 +1718,7 @@ CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_SCAN_ASYNC=y # # SCSI Transports @@ -1981,6 +1981,7 @@ CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHE_EDEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -3399,6 +3400,7 @@ CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NCT6775=m +# CONFIG_SENSORS_NTC_THERMISTOR is not set CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -4816,18 +4818,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5187,7 +5177,6 @@ CONFIG_DMA_OF=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m |