From 8421e68301cd00265bc8db838e69254316c7133a Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 29 Jun 2013 01:17:51 -0700
Subject: Sat Jun 29 01:17:51 PDT 2013

---
 libre/linux-libre/config.x86_64.3.10 | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'libre/linux-libre/config.x86_64.3.10')

diff --git a/libre/linux-libre/config.x86_64.3.10 b/libre/linux-libre/config.x86_64.3.10
index 4c4838cca..ed592fa43 100644
--- a/libre/linux-libre/config.x86_64.3.10
+++ b/libre/linux-libre/config.x86_64.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=y
 CONFIG_X86_64=y
@@ -1536,8 +1536,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 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
@@ -3793,7 +3793,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
@@ -3838,6 +3837,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
 
 #
@@ -3915,7 +3915,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
@@ -4415,7 +4414,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
 
-- 
cgit v1.2.3-54-g00ecf