summaryrefslogtreecommitdiff
path: root/libre/linux-libre/config.i686.3.10
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-06-29 01:17:51 -0700
committerroot <root@rshg054.dnsready.net>2013-06-29 01:17:51 -0700
commit8421e68301cd00265bc8db838e69254316c7133a (patch)
treeaf089edb7cb6846d1fcb4ffc98d3e4f38ea18345 /libre/linux-libre/config.i686.3.10
parent0a66b29837912ffee94e074fc35ba46896a96f2a (diff)
Sat Jun 29 01:17:51 PDT 2013
Diffstat (limited to 'libre/linux-libre/config.i686.3.10')
-rw-r--r--libre/linux-libre/config.i686.3.1010
1 files changed, 4 insertions, 6 deletions
diff --git a/libre/linux-libre/config.i686.3.10 b/libre/linux-libre/config.i686.3.10
index 129ab764f..9eaa84b4f 100644
--- a/libre/linux-libre/config.i686.3.10
+++ b/libre/linux-libre/config.i686.3.10
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.0-rc6 Kernel Configuration
+# Linux/x86 3.10.0-rc7 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1586,8 +1586,8 @@ CONFIG_OF_MTD=y
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
CONFIG_PARPORT_PC_PCMCIA=m
# CONFIG_PARPORT_GSC is not set
CONFIG_PARPORT_AX88796=m
@@ -3924,7 +3924,6 @@ CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
-CONFIG_RADIO_SI476X=m
CONFIG_USB_MR800=m
CONFIG_USB_DSBR=m
CONFIG_RADIO_MAXIRADIO=m
@@ -3970,6 +3969,7 @@ CONFIG_SMS_SIANO_RC=y
# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
CONFIG_VIDEO_IR_I2C=m
#
@@ -4047,7 +4047,6 @@ CONFIG_VIDEO_M52790=m
#
# Sensors used on soc_camera driver
#
-CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4597,7 +4596,6 @@ CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
# CONFIG_SND_SOC is not set
-CONFIG_SND_SOC_SI476X=m
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m