bump 3.10 configs

This commit is contained in:
Tobias Powalowski 2013-06-23 19:20:06 +00:00
parent 1d90678f1c
commit 14f5a577a6
2 changed files with 4 additions and 8 deletions

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # 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_64BIT is not set
CONFIG_X86_32=y CONFIG_X86_32=y
@ -3936,7 +3936,6 @@ CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_SI470X=y CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m CONFIG_I2C_SI470X=m
CONFIG_RADIO_SI476X=m
CONFIG_USB_MR800=m CONFIG_USB_MR800=m
CONFIG_USB_DSBR=m CONFIG_USB_DSBR=m
CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAXIRADIO=m
@ -3982,6 +3981,7 @@ CONFIG_SMS_SIANO_RC=y
# Media ancillary drivers (tuners, sensors, i2c, frontends) # Media ancillary drivers (tuners, sensors, i2c, frontends)
# #
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_IR_I2C=m
# #
@ -4059,7 +4059,6 @@ CONFIG_VIDEO_M52790=m
# #
# Sensors used on soc_camera driver # Sensors used on soc_camera driver
# #
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA8290=m
@ -4609,7 +4608,6 @@ CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m CONFIG_SND_PDAUDIOCF=m
# CONFIG_SND_SOC is not set # CONFIG_SND_SOC is not set
CONFIG_SND_SOC_SI476X=m
# CONFIG_SOUND_PRIME is not set # CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m CONFIG_AC97_BUS=m

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # 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_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -3805,7 +3805,6 @@ CONFIG_RADIO_ADAPTERS=y
CONFIG_RADIO_SI470X=y CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m CONFIG_I2C_SI470X=m
CONFIG_RADIO_SI476X=m
CONFIG_USB_MR800=m CONFIG_USB_MR800=m
CONFIG_USB_DSBR=m CONFIG_USB_DSBR=m
CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAXIRADIO=m
@ -3850,6 +3849,7 @@ CONFIG_SMS_SIANO_RC=y
# Media ancillary drivers (tuners, sensors, i2c, frontends) # Media ancillary drivers (tuners, sensors, i2c, frontends)
# #
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
CONFIG_MEDIA_ATTACH=y
CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_IR_I2C=m
# #
@ -3927,7 +3927,6 @@ CONFIG_VIDEO_M52790=m
# #
# Sensors used on soc_camera driver # Sensors used on soc_camera driver
# #
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA8290=m
@ -4427,7 +4426,6 @@ CONFIG_SND_PCMCIA=y
CONFIG_SND_VXPOCKET=m CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m CONFIG_SND_PDAUDIOCF=m
# CONFIG_SND_SOC is not set # CONFIG_SND_SOC is not set
CONFIG_SND_SOC_SI476X=m
# CONFIG_SOUND_PRIME is not set # CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m CONFIG_AC97_BUS=m