[kernel] r19624 - in dists/trunk/linux/debian/config: . armhf kernelarch-x86 mips mipsel sparc
Ben Hutchings
benh at alioth.debian.org
Sat Dec 22 02:45:40 UTC 2012
Author: benh
Date: Sat Dec 22 02:45:39 2012
New Revision: 19624
Log:
Update V4L/DVB config following reorganisation in 3.7
Modified:
dists/trunk/linux/debian/config/armhf/config.omap
dists/trunk/linux/debian/config/config
dists/trunk/linux/debian/config/kernelarch-x86/config
dists/trunk/linux/debian/config/mips/config.r4k-ip22
dists/trunk/linux/debian/config/mips/config.r5k-ip32
dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux/debian/config/sparc/config
Modified: dists/trunk/linux/debian/config/armhf/config.omap
==============================================================================
--- dists/trunk/linux/debian/config/armhf/config.omap Wed Dec 19 12:21:44 2012 (r19623)
+++ dists/trunk/linux/debian/config/armhf/config.omap Sat Dec 22 02:45:39 2012 (r19624)
@@ -117,6 +117,11 @@
CONFIG_MEDIA_CONTROLLER=y
##
+## file: drivers/media/platform/omap/Kconfig
+##
+CONFIG_VIDEO_OMAP2_VOUT=m
+
+##
## file: drivers/media/radio/Kconfig
##
CONFIG_RADIO_ADAPTERS=y
@@ -129,11 +134,6 @@
CONFIG_RADIO_WL128X=m
##
-## file: drivers/media/video/omap/Kconfig
-##
-CONFIG_VIDEO_OMAP2_VOUT=m
-
-##
## file: drivers/misc/ti-st/Kconfig
##
CONFIG_TI_ST=m
Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config Wed Dec 19 12:21:44 2012 (r19623)
+++ dists/trunk/linux/debian/config/config Sat Dec 22 02:45:39 2012 (r19624)
@@ -963,99 +963,17 @@
CONFIG_MEDIA_RC_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_DVB_NET=y
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
##
-## file: drivers/media/common/tuners/Kconfig
-##
-CONFIG_MEDIA_ATTACH=y
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TEA5761=y
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-
-##
-## file: drivers/media/dvb/Kconfig
+## file: drivers/media/dvb-core/Kconfig
##
CONFIG_DVB_MAX_ADAPTERS=8
CONFIG_DVB_DYNAMIC_MINORS=y
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-##
-## file: drivers/media/dvb/b2c2/Kconfig
-##
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-##
-## file: drivers/media/dvb/bt8xx/Kconfig
-##
-CONFIG_DVB_BT8XX=m
-
-##
-## file: drivers/media/dvb/ddbridge/Kconfig
-##
-CONFIG_DVB_DDBRIDGE=m
-
-##
-## file: drivers/media/dvb/dm1105/Kconfig
-##
-CONFIG_DVB_DM1105=m
##
-## file: drivers/media/dvb/dvb-usb/Kconfig
+## file: drivers/media/dvb-frontends/Kconfig
##
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_IT913X=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_AF9035=m
-
-##
-## file: drivers/media/dvb/firewire/Kconfig
-##
-CONFIG_DVB_FIREDTV=m
-
-##
-## file: drivers/media/dvb/frontends/Kconfig
-##
-# CONFIG_DVB_FE_CUSTOMISE is not set
CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
CONFIG_DVB_MT312=m
@@ -1099,36 +1017,185 @@
CONFIG_DVB_DUMMY_FE=m
##
-## file: drivers/media/dvb/mantis/Kconfig
+## file: drivers/media/firewire/Kconfig
+##
+CONFIG_DVB_FIREDTV=m
+
+##
+## file: drivers/media/i2c/Kconfig
+##
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_SAA6588=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_VPX3220=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+##
+## file: drivers/media/i2c/cx25840/Kconfig
+##
+CONFIG_VIDEO_CX25840=m
+
+##
+## file: drivers/media/i2c/soc_camera/Kconfig
+##
+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_OV6650=m
+CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_TW9910=m
+
+##
+## file: drivers/media/mmc/siano/Kconfig
+##
+CONFIG_SMS_SDIO_DRV=m
+
+##
+## file: drivers/media/parport/Kconfig
+##
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_W9966=m
+
+##
+## file: drivers/media/pci/Kconfig
+##
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+##
+## file: drivers/media/pci/b2c2/Kconfig
+##
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+
+##
+## file: drivers/media/pci/bt8xx/Kconfig
+##
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+
+##
+## file: drivers/media/pci/cx18/Kconfig
+##
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+
+##
+## file: drivers/media/pci/cx23885/Kconfig
+##
+CONFIG_VIDEO_CX23885=m
+
+##
+## file: drivers/media/pci/cx25821/Kconfig
+##
+# CONFIG_VIDEO_CX25821 is not set
+
+##
+## file: drivers/media/pci/cx88/Kconfig
+##
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+
+##
+## file: drivers/media/pci/ddbridge/Kconfig
+##
+CONFIG_DVB_DDBRIDGE=m
+
+##
+## file: drivers/media/pci/dm1105/Kconfig
+##
+CONFIG_DVB_DM1105=m
+
+##
+## file: drivers/media/pci/ivtv/Kconfig
+##
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_FB_IVTV=m
+
+##
+## file: drivers/media/pci/mantis/Kconfig
##
CONFIG_MANTIS_CORE=m
CONFIG_DVB_MANTIS=m
CONFIG_DVB_HOPPER=m
##
-## file: drivers/media/dvb/ngene/Kconfig
+## file: drivers/media/pci/meye/Kconfig
+##
+CONFIG_VIDEO_MEYE=m
+
+##
+## file: drivers/media/pci/ngene/Kconfig
##
CONFIG_DVB_NGENE=m
##
-## file: drivers/media/dvb/pluto2/Kconfig
+## file: drivers/media/pci/pluto2/Kconfig
##
CONFIG_DVB_PLUTO2=m
##
-## file: drivers/media/dvb/pt1/Kconfig
+## file: drivers/media/pci/pt1/Kconfig
##
CONFIG_DVB_PT1=m
##
-## file: drivers/media/dvb/siano/Kconfig
+## file: drivers/media/pci/saa7134/Kconfig
##
-CONFIG_SMS_SIANO_MDTV=m
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+
+##
+## file: drivers/media/pci/saa7146/Kconfig
+##
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
##
-## file: drivers/media/dvb/ttpci/Kconfig
+## file: drivers/media/pci/saa7164/Kconfig
+##
+CONFIG_VIDEO_SAA7164=m
+
+##
+## file: drivers/media/pci/ttpci/Kconfig
##
CONFIG_DVB_AV7110=m
CONFIG_DVB_AV7110_OSD=y
@@ -1139,14 +1206,37 @@
CONFIG_DVB_BUDGET_PATCH=m
##
-## file: drivers/media/dvb/ttusb-budget/Kconfig
+## file: drivers/media/pci/zoran/Kconfig
##
-CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
##
-## file: drivers/media/dvb/ttusb-dec/Kconfig
+## file: drivers/media/platform/Kconfig
##
-CONFIG_DVB_TTUSB_DEC=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVI=m
+# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
+
+##
+## file: drivers/media/platform/marvell-ccic/Kconfig
+##
+CONFIG_VIDEO_CAFE_CCIC=m
+
+##
+## file: drivers/media/platform/soc_camera/Kconfig
+##
+CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_VIDEO_SH_MOBILE_CEU=m
##
## file: drivers/media/radio/Kconfig
@@ -1203,96 +1293,38 @@
CONFIG_RC_MAP=m
##
-## file: drivers/media/video/Kconfig
+## file: drivers/media/tuners/Kconfig
##
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_SAA6588=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_W9966=m
-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_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_VIDEO_SH_MOBILE_CEU=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
##
-## file: drivers/media/video/au0828/Kconfig
+## file: drivers/media/usb/Kconfig
##
-CONFIG_VIDEO_AU0828=m
+CONFIG_MEDIA_USB_SUPPORT=y
##
-## file: drivers/media/video/bt8xx/Kconfig
+## file: drivers/media/usb/au0828/Kconfig
##
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_AU0828=m
##
-## file: drivers/media/video/cpia2/Kconfig
+## file: drivers/media/usb/b2c2/Kconfig
##
-CONFIG_VIDEO_CPIA2=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
##
-## file: drivers/media/video/cx18/Kconfig
+## file: drivers/media/usb/cpia2/Kconfig
##
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CPIA2=m
##
-## file: drivers/media/video/cx231xx/Kconfig
+## file: drivers/media/usb/cx231xx/Kconfig
##
CONFIG_VIDEO_CX231XX=m
CONFIG_VIDEO_CX231XX_RC=y
@@ -1300,31 +1332,54 @@
CONFIG_VIDEO_CX231XX_DVB=m
##
-## file: drivers/media/video/cx23885/Kconfig
-##
-CONFIG_VIDEO_CX23885=m
-
+## file: drivers/media/usb/dvb-usb-v2/Kconfig
##
-## file: drivers/media/video/cx25821/Kconfig
-##
-# CONFIG_VIDEO_CX25821 is not set
-
-##
-## file: drivers/media/video/cx25840/Kconfig
-##
-CONFIG_VIDEO_CX25840=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
##
-## file: drivers/media/video/cx88/Kconfig
+## file: drivers/media/usb/dvb-usb/Kconfig
##
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
##
-## file: drivers/media/video/em28xx/Kconfig
+## file: drivers/media/usb/em28xx/Kconfig
##
CONFIG_VIDEO_EM28XX=m
CONFIG_VIDEO_EM28XX_ALSA=m
@@ -1332,7 +1387,7 @@
CONFIG_VIDEO_EM28XX_RC=y
##
-## file: drivers/media/video/gspca/Kconfig
+## file: drivers/media/usb/gspca/Kconfig
##
CONFIG_USB_GSPCA=m
CONFIG_USB_GSPCA_BENQ=m
@@ -1379,38 +1434,27 @@
CONFIG_USB_GSPCA_ZC3XX=m
##
-## file: drivers/media/video/gspca/gl860/Kconfig
+## file: drivers/media/usb/gspca/gl860/Kconfig
##
CONFIG_USB_GL860=m
##
-## file: drivers/media/video/gspca/m5602/Kconfig
+## file: drivers/media/usb/gspca/m5602/Kconfig
##
CONFIG_USB_M5602=m
##
-## file: drivers/media/video/gspca/stv06xx/Kconfig
+## file: drivers/media/usb/gspca/stv06xx/Kconfig
##
CONFIG_USB_STV06XX=m
##
-## file: drivers/media/video/hdpvr/Kconfig
+## file: drivers/media/usb/hdpvr/Kconfig
##
CONFIG_VIDEO_HDPVR=m
##
-## file: drivers/media/video/ivtv/Kconfig
-##
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-
-##
-## file: drivers/media/video/marvell-ccic/Kconfig
-##
-CONFIG_VIDEO_CAFE_CCIC=m
-
-##
-## file: drivers/media/video/pvrusb2/Kconfig
+## file: drivers/media/usb/pvrusb2/Kconfig
##
CONFIG_VIDEO_PVRUSB2=m
CONFIG_VIDEO_PVRUSB2_SYSFS=y
@@ -1418,57 +1462,68 @@
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
##
-## file: drivers/media/video/pwc/Kconfig
+## file: drivers/media/usb/pwc/Kconfig
##
CONFIG_USB_PWC=m
# CONFIG_USB_PWC_DEBUG is not set
CONFIG_USB_PWC_INPUT_EVDEV=y
##
-## file: drivers/media/video/saa7134/Kconfig
+## file: drivers/media/usb/s2255/Kconfig
##
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_USB_S2255=m
##
-## file: drivers/media/video/saa7164/Kconfig
+## file: drivers/media/usb/siano/Kconfig
##
-CONFIG_VIDEO_SAA7164=m
+CONFIG_SMS_USB_DRV=m
##
-## file: drivers/media/video/sn9c102/Kconfig
+## file: drivers/media/usb/sn9c102/Kconfig
##
CONFIG_USB_SN9C102=m
##
-## file: drivers/media/video/tlg2300/Kconfig
+## file: drivers/media/usb/stkwebcam/Kconfig
+##
+CONFIG_USB_STKWEBCAM=m
+
+##
+## file: drivers/media/usb/tlg2300/Kconfig
##
CONFIG_VIDEO_TLG2300=m
##
-## file: drivers/media/video/usbvision/Kconfig
+## file: drivers/media/usb/ttusb-budget/Kconfig
+##
+CONFIG_DVB_TTUSB_BUDGET=m
+
+##
+## file: drivers/media/usb/ttusb-dec/Kconfig
+##
+CONFIG_DVB_TTUSB_DEC=m
+
+##
+## file: drivers/media/usb/usbvision/Kconfig
##
CONFIG_VIDEO_USBVISION=m
##
-## file: drivers/media/video/uvc/Kconfig
+## file: drivers/media/usb/uvc/Kconfig
##
CONFIG_USB_VIDEO_CLASS=m
CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
##
-## file: drivers/media/video/zoran/Kconfig
+## file: drivers/media/usb/zr364xx/Kconfig
##
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_USB_ZR364XX=m
+
+##
+## file: drivers/media/v4l2-core/Kconfig
+##
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
##
## file: drivers/memstick/Kconfig
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config Wed Dec 19 12:21:44 2012 (r19623)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config Sat Dec 22 02:45:39 2012 (r19624)
@@ -667,6 +667,11 @@
CONFIG_LEDS_CLEVO_MAIL=m
##
+## file: drivers/media/platform/Kconfig
+##
+CONFIG_VIDEO_VIA_CAMERA=m
+
+##
## file: drivers/media/radio/Kconfig
##
CONFIG_USB_DSBR=m
@@ -681,12 +686,7 @@
CONFIG_IR_WINBOND_CIR=m
##
-## file: drivers/media/video/Kconfig
-##
-CONFIG_VIDEO_VIA_CAMERA=m
-
-##
-## file: drivers/media/video/tm6000/Kconfig
+## file: drivers/media/usb/tm6000/Kconfig
##
CONFIG_VIDEO_TM6000=m
CONFIG_VIDEO_TM6000_ALSA=m
Modified: dists/trunk/linux/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r4k-ip22 Wed Dec 19 12:21:44 2012 (r19623)
+++ dists/trunk/linux/debian/config/mips/config.r4k-ip22 Sat Dec 22 02:45:39 2012 (r19624)
@@ -261,13 +261,16 @@
# CONFIG_RADIO_ZOLTRIX is not set
##
-## file: drivers/media/video/Kconfig
+## file: drivers/media/parport/Kconfig
##
-# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_PMS is not set
# CONFIG_VIDEO_W9966 is not set
+
+##
+## file: drivers/media/platform/Kconfig
+##
CONFIG_VIDEO_VINO=m
##
Modified: dists/trunk/linux/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r5k-ip32 Wed Dec 19 12:21:44 2012 (r19623)
+++ dists/trunk/linux/debian/config/mips/config.r5k-ip32 Sat Dec 22 02:45:39 2012 (r19624)
@@ -283,32 +283,35 @@
# CONFIG_RADIO_MAXIRADIO is not set
##
-## file: drivers/media/video/Kconfig
+## file: drivers/media/parport/Kconfig
##
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
##
-## file: drivers/media/video/bt8xx/Kconfig
+## file: drivers/media/pci/bt8xx/Kconfig
##
# CONFIG_VIDEO_BT848 is not set
##
-## file: drivers/media/video/cx88/Kconfig
+## file: drivers/media/pci/cx88/Kconfig
##
# CONFIG_VIDEO_CX88 is not set
##
-## file: drivers/media/video/saa7134/Kconfig
+## file: drivers/media/pci/saa7134/Kconfig
##
# CONFIG_VIDEO_SAA7134 is not set
##
+## file: drivers/media/pci/saa7146/Kconfig
+##
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_MXB is not set
+
+##
## file: drivers/message/fusion/Kconfig
##
# CONFIG_FUSION is not set
Modified: dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a Wed Dec 19 12:21:44 2012 (r19623)
+++ dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a Sat Dec 22 02:45:39 2012 (r19624)
@@ -334,56 +334,59 @@
# CONFIG_INPUT_TOUCHSCREEN is not set
##
-## file: drivers/media/radio/Kconfig
-##
-# CONFIG_USB_DSBR is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-
-##
-## file: drivers/media/video/Kconfig
+## file: drivers/media/parport/Kconfig
##
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
##
-## file: drivers/media/video/bt8xx/Kconfig
+## file: drivers/media/pci/bt8xx/Kconfig
##
# CONFIG_VIDEO_BT848 is not set
##
-## file: drivers/media/video/cx88/Kconfig
+## file: drivers/media/pci/cx88/Kconfig
##
# CONFIG_VIDEO_CX88 is not set
##
-## file: drivers/media/video/em28xx/Kconfig
+## file: drivers/media/pci/saa7134/Kconfig
##
-# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_SAA7134 is not set
##
-## file: drivers/media/video/pwc/Kconfig
+## file: drivers/media/pci/saa7146/Kconfig
##
-# CONFIG_USB_PWC is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_MXB is not set
##
-## file: drivers/media/video/saa7134/Kconfig
+## file: drivers/media/pci/zoran/Kconfig
##
-# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_ZORAN is not set
##
-## file: drivers/media/video/sn9c102/Kconfig
+## file: drivers/media/radio/Kconfig
##
-# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_RADIO_MAXIRADIO is not set
##
-## file: drivers/media/video/zoran/Kconfig
+## file: drivers/media/usb/em28xx/Kconfig
##
-# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_EM28XX is not set
+
+##
+## file: drivers/media/usb/pwc/Kconfig
+##
+# CONFIG_USB_PWC is not set
+
+##
+## file: drivers/media/usb/sn9c102/Kconfig
+##
+# CONFIG_USB_SN9C102 is not set
##
## file: drivers/message/fusion/Kconfig
Modified: dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b Wed Dec 19 12:21:44 2012 (r19623)
+++ dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b Sat Dec 22 02:45:39 2012 (r19624)
@@ -340,56 +340,59 @@
# CONFIG_INPUT_TOUCHSCREEN is not set
##
-## file: drivers/media/radio/Kconfig
-##
-# CONFIG_USB_DSBR is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-
-##
-## file: drivers/media/video/Kconfig
+## file: drivers/media/parport/Kconfig
##
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
##
-## file: drivers/media/video/bt8xx/Kconfig
+## file: drivers/media/pci/bt8xx/Kconfig
##
# CONFIG_VIDEO_BT848 is not set
##
-## file: drivers/media/video/cx88/Kconfig
+## file: drivers/media/pci/cx88/Kconfig
##
# CONFIG_VIDEO_CX88 is not set
##
-## file: drivers/media/video/em28xx/Kconfig
+## file: drivers/media/pci/saa7134/Kconfig
##
-# CONFIG_VIDEO_EM28XX is not set
+# CONFIG_VIDEO_SAA7134 is not set
##
-## file: drivers/media/video/pwc/Kconfig
+## file: drivers/media/pci/saa7146/Kconfig
##
-# CONFIG_USB_PWC is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_MXB is not set
##
-## file: drivers/media/video/saa7134/Kconfig
+## file: drivers/media/pci/zoran/Kconfig
##
-# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_ZORAN is not set
##
-## file: drivers/media/video/sn9c102/Kconfig
+## file: drivers/media/radio/Kconfig
##
-# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_RADIO_MAXIRADIO is not set
##
-## file: drivers/media/video/zoran/Kconfig
+## file: drivers/media/usb/em28xx/Kconfig
##
-# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_EM28XX is not set
+
+##
+## file: drivers/media/usb/pwc/Kconfig
+##
+# CONFIG_USB_PWC is not set
+
+##
+## file: drivers/media/usb/sn9c102/Kconfig
+##
+# CONFIG_USB_SN9C102 is not set
##
## file: drivers/message/fusion/Kconfig
Modified: dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt Wed Dec 19 12:21:44 2012 (r19623)
+++ dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt Sat Dec 22 02:45:39 2012 (r19624)
@@ -263,29 +263,32 @@
CONFIG_LEDS_COBALT_RAQ=y
##
-## file: drivers/media/radio/Kconfig
+## file: drivers/media/parport/Kconfig
##
-# CONFIG_USB_DSBR is not set
-# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_W9966 is not set
##
-## file: drivers/media/video/Kconfig
+## file: drivers/media/pci/saa7146/Kconfig
##
-# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_W9966 is not set
##
-## file: drivers/media/video/pwc/Kconfig
+## file: drivers/media/radio/Kconfig
+##
+# CONFIG_USB_DSBR is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+
+##
+## file: drivers/media/usb/pwc/Kconfig
##
# CONFIG_USB_PWC is not set
##
-## file: drivers/media/video/sn9c102/Kconfig
+## file: drivers/media/usb/sn9c102/Kconfig
##
# CONFIG_USB_SN9C102 is not set
Modified: dists/trunk/linux/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux/debian/config/sparc/config Wed Dec 19 12:21:44 2012 (r19623)
+++ dists/trunk/linux/debian/config/sparc/config Sat Dec 22 02:45:39 2012 (r19624)
@@ -214,37 +214,36 @@
# CONFIG_INPUT_TOUCHSCREEN is not set
##
-## file: drivers/media/radio/Kconfig
-##
-# CONFIG_USB_DSBR is not set
-# CONFIG_RADIO_MAXIRADIO is not set
-
+## file: drivers/media/parport/Kconfig
##
-## file: drivers/media/video/Kconfig
-##
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
# CONFIG_VIDEO_W9966 is not set
##
-## file: drivers/media/video/bt8xx/Kconfig
+## file: drivers/media/pci/cx88/Kconfig
##
-CONFIG_VIDEO_BT848=m
+# CONFIG_VIDEO_CX88 is not set
##
-## file: drivers/media/video/cx88/Kconfig
+## file: drivers/media/pci/saa7146/Kconfig
##
-# CONFIG_VIDEO_CX88 is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_MXB is not set
##
-## file: drivers/media/video/zoran/Kconfig
+## file: drivers/media/pci/zoran/Kconfig
##
# CONFIG_VIDEO_ZORAN is not set
##
+## file: drivers/media/radio/Kconfig
+##
+# CONFIG_USB_DSBR is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+
+##
## file: drivers/message/i2o/Kconfig
##
# CONFIG_I2O is not set
More information about the Kernel-svn-changes
mailing list