Patchwork [1/2,ubuntu,mainline,kernel,config] : add media support again.

login
register
mail settings
Submitter Hauke Mehrtens
Date Sept. 9, 2012, 12:37 p.m.
Message ID <1347194234-31558-1-git-send-email-hauke@hauke-m.de>
Download mbox | patch
Permalink /patch/182860/
State New
Headers show

Comments

Hauke Mehrtens - Sept. 9, 2012, 12:37 p.m.
This patch is based on top of 0003-default-configs.patch from
http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.6-rc4-quantal/ .

For kernel 3.6-rc1 media support was deactivated for the ubuntu
mainline kernels. This patch activates the following options and
selects then the old values used in kernel 3.5 or the default values
for new options.

CONFIG_MEDIA_ANALOG_TV_SUPPORT
CONFIG_MEDIA_CAMERA_SUPPORT
CONFIG_MEDIA_DIGITAL_TV_SUPPORT
CONFIG_MEDIA_RADIO_SUPPORT
CONFIG_MEDIA_RC_SUPPORT

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 debian.master/config/config.common.ubuntu |  510 ++++++++++++++++++++++++++++-
 1 file changed, 504 insertions(+), 6 deletions(-)
Tim Gardner - Sept. 10, 2012, 3:32 p.m.
On 09/09/2012 06:37 AM, Hauke Mehrtens wrote:
> This patch is based on top of 0003-default-configs.patch from
> http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.6-rc4-quantal/ .
> 
> For kernel 3.6-rc1 media support was deactivated for the ubuntu
> mainline kernels. This patch activates the following options and
> selects then the old values used in kernel 3.5 or the default values
> for new options.
> 
> CONFIG_MEDIA_ANALOG_TV_SUPPORT
> CONFIG_MEDIA_CAMERA_SUPPORT
> CONFIG_MEDIA_DIGITAL_TV_SUPPORT
> CONFIG_MEDIA_RADIO_SUPPORT
> CONFIG_MEDIA_RC_SUPPORT
> 
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
>  debian.master/config/config.common.ubuntu |  510 ++++++++++++++++++++++++++++-
>  1 file changed, 504 insertions(+), 6 deletions(-)
> 

Hauke - given the way Andy has designed the mainline build scripts I
think we have to wait until the R archive opens with the R toolchain and
chroot. Then we'll be able to use the configs from the ubuntu-r repository.

In the meantime you can build v3.6-rc5 from
git://kernel.ubuntu.com/ubuntu/ubuntu-r.git using whatever toolchain you
want (which I know isn't as easy as just downloading a pre-built deb).

git clone git://kernel.ubuntu.com/ubuntu/ubuntu-r.git
cd ubuntu-r
fakeroot debian/rule clean prepare-generic
cp debian/build/build-generic/.config .
make deb-pkg

rtg
Seth Forshee - Sept. 10, 2012, 3:50 p.m.
On Sun, Sep 09, 2012 at 02:37:13PM +0200, Hauke Mehrtens wrote:
> This patch is based on top of 0003-default-configs.patch from
> http://kernel.ubuntu.com/~kernel-ppa/mainline/v3.6-rc4-quantal/ .
> 
> For kernel 3.6-rc1 media support was deactivated for the ubuntu
> mainline kernels. This patch activates the following options and
> selects then the old values used in kernel 3.5 or the default values
> for new options.
> 
> CONFIG_MEDIA_ANALOG_TV_SUPPORT
> CONFIG_MEDIA_CAMERA_SUPPORT
> CONFIG_MEDIA_DIGITAL_TV_SUPPORT
> CONFIG_MEDIA_RADIO_SUPPORT
> CONFIG_MEDIA_RC_SUPPORT

The mainline builds are done automatically by a script, not maintained
in version control, so there isn't really anywhere to apply this patch
to.

The script takes the configs for our current development kernel and
essentially runs 'yes "" | make oldconfig' to set new options to the
default values. Doing this manually I see the defaults for all the
options above as being N (the Kconfig doesn't specify any default
values).

I'll follow up with patches for kteam-tools which should get your
options (both for media and for comedi) enabled in the mainline builds.

Seth

Patch

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4defab9..ee6fcbf 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1284,11 +1284,174 @@  CONFIG_DS1682=m
 CONFIG_DSCC4=m
 CONFIG_DSCC4_PCISYNC=y
 CONFIG_DSCC4_PCI_RST=y
+# CONFIG_DT3155_CCIR is not set
+CONFIG_DT3155_STREAMING=y
 CONFIG_DTC=y
 CONFIG_DTL=y
 CONFIG_DTLK=m
 CONFIG_DUMMY=m
 CONFIG_DUMMY_CONSOLE=y
+CONFIG_DVB_A8293=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_AS102=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_B2C2_FLEXCOP=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_BT8XX=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_CAPTURE_DRIVERS=y
+CONFIG_DVB_CORE=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_DDBRIDGE=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_DS3000=m
+# CONFIG_DVB_DUMMY_FE is not set
+CONFIG_DVB_DYNAMIC_MINORS=y
+CONFIG_DVB_EC100=m
+CONFIG_DVB_FE_CUSTOMISE=y
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_DVB_HD29L2=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MB86A20S=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_NET=y
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_PLL=m
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_S5H1411=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_S921=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STV0297=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_TDA10071=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_USB=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_ZL10353=m
 CONFIG_DW_APB_TIMER=y
 CONFIG_DW_DMAC=m
 CONFIG_DW_WATCHDOG=m
@@ -1303,6 +1466,8 @@  CONFIG_E2100=m
 CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_INTEL_MID=y
+CONFIG_EASYCAP=m
+# CONFIG_EASYCAP_DEBUG is not set
 CONFIG_ECHO=m
 CONFIG_ECRYPT_FS=y
 CONFIG_EDAC_AMD64=m
@@ -1667,7 +1832,6 @@  CONFIG_GPIO_74X164=m
 CONFIG_GPIO_ADP5520=m
 CONFIG_GPIO_ADP5588=m
 # CONFIG_GPIO_AMD8111 is not set
-# CONFIG_GPIO_BT8XX is not set
 CONFIG_GPIO_CS5535=m
 # CONFIG_GPIO_EM is not set
 CONFIG_GPIO_GENERIC=m
@@ -2029,6 +2193,8 @@  CONFIG_I2C_PIIX4=m
 CONFIG_I2C_POWERMAC=y
 # CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_SCMI=m
+CONFIG_I2C_SI470X=m
+CONFIG_I2C_SI4713=m
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_SIS5595=m
 CONFIG_I2C_SIS630=m
@@ -2422,6 +2588,26 @@  CONFIG_IRQ_REMAP=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_IRQ_WORK=y
 CONFIG_IRTTY_SIR=m
+CONFIG_IR_ENE=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_GPIO_CIR=m
+# CONFIG_IR_IGUANA is not set
+CONFIG_IR_IMON=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
 CONFIG_ISAPNP=y
 CONFIG_ISA_DMA_API=y
 CONFIG_ISCSI_BOOT_SYSFS=m
@@ -2710,6 +2896,18 @@  CONFIG_LINE6_USB=m
 # CONFIG_LINE6_USB_DUMP_PCM is not set
 # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
 # CONFIG_LINE6_USB_RAW is not set
+CONFIG_LIRC=m
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_TTUSBIR=m
+CONFIG_LIRC_ZILOG=m
 CONFIG_LIS3L02DQ_BUF_KFIFO=y
 # CONFIG_LIS3L02DQ_BUF_RING_SW is not set
 CONFIG_LITELINK_DONGLE=m
@@ -2808,6 +3006,7 @@  CONFIG_MACVTAP=m
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_MAC_FLOPPY=m
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_MANTIS_CORE=m
 CONFIG_MARVELL_PHY=y
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_MATOM is not set
@@ -2838,12 +3037,42 @@  CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_CAMERA_SUPPORT is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_RC_SUPPORT is not set
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MEFFICEON is not set
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -4001,6 +4230,31 @@  CONFIG_R6040=m
 CONFIG_R8169=m
 CONFIG_R8187SE=m
 CONFIG_R8712U=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_AZTECH=m
+CONFIG_RADIO_CADET=m
+CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_ISA=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MIROPCM20=m
+CONFIG_RADIO_RTRACK=m
+CONFIG_RADIO_RTRACK2=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_SF16FMI=m
+CONFIG_RADIO_SF16FMR2=m
+# CONFIG_RADIO_SHARK is not set
+# CONFIG_RADIO_SHARK2 is not set
+CONFIG_RADIO_SI470X=y
+CONFIG_RADIO_SI4713=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TERRATEC=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_TRUST=m
+CONFIG_RADIO_TYPHOON=m
+CONFIG_RADIO_WL1273=m
+CONFIG_RADIO_WL128X=m
+CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID6_PQ=m
 CONFIG_RAID_ATTRS=m
 CONFIG_RAPIDIO=y
@@ -4024,6 +4278,12 @@  CONFIG_RCU_FANOUT_LEAF=16
 CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_RC_CORE=m
+CONFIG_RC_DECODERS=y
+CONFIG_RC_DEVICES=y
+CONFIG_RC_LOOPBACK=m
+CONFIG_RC_MAP=m
 CONFIG_RDS=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_RDS_RDMA=m
@@ -4661,6 +4921,9 @@  CONFIG_SMSC911X=m
 CONFIG_SMSC9420=m
 CONFIG_SMSC_PHY=y
 CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_USB_DRV=m
 CONFIG_SM_FTL=m
 CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_AC97_POWER_SAVE=y
@@ -4724,10 +4987,12 @@  CONFIG_SND_ES18XX=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FIREWIRE=y
 CONFIG_SND_FIREWIRE_LIB=m
 CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
 CONFIG_SND_GINA20=m
 CONFIG_SND_GINA24=m
 CONFIG_SND_GUSCLASSIC=m
@@ -4950,6 +5215,7 @@  CONFIG_SND_SPI=y
 CONFIG_SND_SSCAPE=m
 CONFIG_SND_SST_PLATFORM=m
 CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_TEA575X=m
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB=y
 CONFIG_SND_USB_6FIRE=m
@@ -4973,11 +5239,28 @@  CONFIG_SND_WAVEFRONT=m
 CONFIG_SND_WSS_LIB=m
 CONFIG_SND_YMFPCI=m
 CONFIG_SOC_AM33XX=y
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_IMX074=m
+CONFIG_SOC_CAMERA_MT9M001=m
+CONFIG_SOC_CAMERA_MT9M111=m
+CONFIG_SOC_CAMERA_MT9T031=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_MT9V022=m
+CONFIG_SOC_CAMERA_OV2640=m
+CONFIG_SOC_CAMERA_OV5642=m
+CONFIG_SOC_CAMERA_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_HAS_OMAP2_SDRC=y
 CONFIG_SOC_OMAP3430=y
 # CONFIG_SOC_OMAP5 is not set
 CONFIG_SOC_TI81XX=y
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_SOLO6X10=m
 CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_LAPTOP=m
@@ -5281,6 +5564,7 @@  CONFIG_TREE_RCU=y
 CONFIG_TRUSTED_KEYS=y
 CONFIG_TSL2583=m
 CONFIG_TSL2x7x=m
+CONFIG_TTPCI_EEPROM=m
 CONFIG_TTY_PRINTK=y
 CONFIG_TULIP=m
 # CONFIG_TULIP_MMIO is not set
@@ -5357,6 +5641,7 @@  CONFIG_USB_CXACRU=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
 # CONFIG_USB_DEBUG is not set
+CONFIG_USB_DSBR=m
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_DWC3=m
 # CONFIG_USB_DWC3_DEBUG is not set
@@ -5395,8 +5680,53 @@  CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_GADGET_SUPERSPEED=y
 CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GL860=m
 CONFIG_USB_GOKU=m
 CONFIG_USB_GPIO_VBUS=m
+CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_USB_G_ACM_MS=m
 CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
@@ -5408,6 +5738,7 @@  CONFIG_USB_G_NCM=m
 CONFIG_USB_G_NOKIA=m
 CONFIG_USB_G_PRINTER=m
 CONFIG_USB_G_SERIAL=m
+CONFIG_USB_G_WEBCAM=m
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
 CONFIG_USB_HID=m
@@ -5427,11 +5758,13 @@  CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_KBD=m
 CONFIG_USB_KC2190=y
+CONFIG_USB_KEENE=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LED=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LIBUSUAL=y
+CONFIG_USB_M5602=m
 # CONFIG_USB_M66592 is not set
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_MDC800=m
@@ -5439,6 +5772,7 @@  CONFIG_USB_MICROTEK=m
 CONFIG_USB_MIDI_GADGET=m
 CONFIG_USB_MON=m
 CONFIG_USB_MOUSE=m
+CONFIG_USB_MR800=m
 # CONFIG_USB_MUSB_AM35X is not set
 # CONFIG_USB_MUSB_DSPS is not set
 CONFIG_USB_MUSB_HDRC=m
@@ -5480,6 +5814,9 @@  CONFIG_USB_OTG_UTILS=y
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_PRINTER=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_R8A66597=m
 CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_RENESAS_USBHS=m
@@ -5487,6 +5824,7 @@  CONFIG_USB_RENESAS_USBHS_HCD=m
 CONFIG_USB_RENESAS_USBHS_UDC=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_RTL8150=m
+CONFIG_USB_S2255=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
@@ -5557,13 +5895,16 @@  CONFIG_USB_SERIAL_WWAN=m
 CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_ZIO=m
 CONFIG_USB_SEVSEG=m
+CONFIG_USB_SI470X=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_SISUSBVGA=m
 # CONFIG_USB_SISUSBVGA_CON is not set
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_HCD_ISO=y
+# CONFIG_USB_SN9C102 is not set
 CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_ALAUDA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
@@ -5579,6 +5920,7 @@  CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_USB_STORAGE_SDDR09=m
 CONFIG_USB_STORAGE_SDDR55=m
 CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STV06XX=m
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_SWITCH_FSA9480=m
@@ -5592,6 +5934,8 @@  CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_USBNET=m
 CONFIG_USB_USS720=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 CONFIG_USB_WHCI_HCD=m
@@ -5607,6 +5951,7 @@  CONFIG_USB_YUREX=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_ZERO=m
 # CONFIG_USB_ZERO_HNPTEST is not set
+CONFIG_USB_ZR364XX=m
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
@@ -5617,6 +5962,13 @@  CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_I1480U=m
 CONFIG_UWB_WHCI=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L_ISA_PARPORT_DRIVERS=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_V4L_PCI_DRIVERS=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_V4L_RADIO_ISA_DRIVERS=y
+CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VCNL4000 is not set
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VETH=m
@@ -5633,7 +5985,153 @@  CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=m
 CONFIG_VIA_WDT=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV7343=m
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX25840=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_DM6446_CCDC=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_VIDEO_FB_IVTV=m
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_OV7640=m
+CONFIG_VIDEO_GO7007_SAA7113=m
+CONFIG_VIDEO_GO7007_SAA7115=m
+CONFIG_VIDEO_GO7007_SONY_TUNER=m
+CONFIG_VIDEO_GO7007_TW2804=m
+CONFIG_VIDEO_GO7007_TW9903=m
+CONFIG_VIDEO_GO7007_UDA1342=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+CONFIG_VIDEO_HDPVR=m
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_IR_I2C=m
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_MEM2MEM_TESTDEV=m
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_OMAP2_VOUT=m
+CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
 CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_PVRUSB2=m
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_PVRUSB2_DVB=y
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_SAA6588=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_SAA7191=m
+CONFIG_VIDEO_SH_MOBILE_CEU=m
+CONFIG_VIDEO_SH_MOBILE_CSI2=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_TCM825X=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_TIMBERDALE=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_VPFE_CAPTURE=m
+CONFIG_VIDEO_VPSS_SYSTEM=m
+CONFIG_VIDEO_VPX3220=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTUALIZATION=y