summaryrefslogtreecommitdiff
path: root/libre/linux-libre/config.i686
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-12 04:41:18 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-12 04:41:18 -0200
commit9f2fbae7555c256938da8b8081bd8331af2674bc (patch)
tree2ec82a52e4c1e3e41a76f31970292867f2471e31 /libre/linux-libre/config.i686
parent681fbbad5a33aee8f378b8d49309ca9ec46d1746 (diff)
downloadabslibre-9f2fbae7555c256938da8b8081bd8331af2674bc.tar.gz
abslibre-9f2fbae7555c256938da8b8081bd8331af2674bc.tar.bz2
abslibre-9f2fbae7555c256938da8b8081bd8331af2674bc.zip
linux-libre-3.12.7-1: updating version
Diffstat (limited to 'libre/linux-libre/config.i686')
-rw-r--r--libre/linux-libre/config.i68625
1 files changed, 10 insertions, 15 deletions
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index db2b3fdb7..94cc0e63b 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -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
@@ -3157,7 +3157,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
@@ -4883,18 +4891,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
@@ -5265,7 +5261,6 @@ CONFIG_DMA_OF=y
#
# DMA Clients
#
-CONFIG_NET_DMA=y
CONFIG_ASYNC_TX_DMA=y
# CONFIG_DMATEST is not set
CONFIG_DCA=m