summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-pae/config
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-12 05:06:19 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-12 05:06:19 -0200
commit785e80430e7dbf435f22ff8a331aafd439808112 (patch)
treec5d8e46a4bf89a0e424bf811405b633cf722be79 /kernels/linux-libre-pae/config
parent9f2fbae7555c256938da8b8081bd8331af2674bc (diff)
downloadabslibre-785e80430e7dbf435f22ff8a331aafd439808112.tar.gz
abslibre-785e80430e7dbf435f22ff8a331aafd439808112.tar.bz2
abslibre-785e80430e7dbf435f22ff8a331aafd439808112.zip
linux-libre-{grsec,knock,pae,xen}-3.12.7-1: updating version
Diffstat (limited to 'kernels/linux-libre-pae/config')
-rw-r--r--kernels/linux-libre-pae/config25
1 files changed, 10 insertions, 15 deletions
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index 3f24889c6..9c681bd68 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-1 Kernel Configuration
+# Linux/x86 3.12.7-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -3159,7 +3159,15 @@ CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_COMPAT=y
CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_MUX is not set
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_SMBUS=m
CONFIG_I2C_ALGOBIT=m
@@ -4886,18 +4894,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
@@ -5268,7 +5264,6 @@ CONFIG_DMA_OF=y
#
# DMA Clients
#
-CONFIG_NET_DMA=y
CONFIG_ASYNC_TX_DMA=y
# CONFIG_DMATEST is not set
CONFIG_DCA=m