move CONFIG_MEDIA_ATTACH & CONFIG_VIDEO_ALLOW_V4L1 to generic config and disable the later (deprecated Video for Linux API v1)
SVN-Revision: 12692
This commit is contained in:
parent
3029c2fd53
commit
59a058534c
11 changed files with 2 additions and 20 deletions
|
@ -132,7 +132,6 @@ CONFIG_LEGACY_PTY_COUNT=256
|
|||
# CONFIG_MACH_DECSTATION is not set
|
||||
# CONFIG_MACH_JAZZ is not set
|
||||
# CONFIG_MACH_VR41XX is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MII=m
|
||||
# CONFIG_MINIX_FS is not set
|
||||
CONFIG_MIPS=y
|
||||
|
@ -274,7 +273,6 @@ CONFIG_USB_OHCI_HCD=m
|
|||
CONFIG_USB_SUPPORT=y
|
||||
# CONFIG_USB_UHCI_HCD is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIDEO_ALLOW_V4L1 is not set
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
CONFIG_VIDEO_V4L2_COMMON=m
|
||||
|
|
|
@ -156,7 +156,6 @@ CONFIG_LEGACY_PTY_COUNT=256
|
|||
# CONFIG_MACH_DECSTATION is not set
|
||||
# CONFIG_MACH_JAZZ is not set
|
||||
# CONFIG_MACH_VR41XX is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MII=m
|
||||
# CONFIG_MINIX_FS is not set
|
||||
CONFIG_MIPS=y
|
||||
|
@ -313,7 +312,6 @@ CONFIG_USB_SUPPORT=y
|
|||
# CONFIG_USB_UHCI_HCD is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
# CONFIG_VIDEO_ALLOW_V4L1 is not set
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
CONFIG_VIDEO_V4L2_COMMON=m
|
||||
|
|
|
@ -101,7 +101,6 @@ CONFIG_LEDS_GPIO=y
|
|||
# CONFIG_MACH_JAZZ is not set
|
||||
# CONFIG_MACH_VR41XX is not set
|
||||
# CONFIG_MDIO_BITBANG is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MICREL_PHY=y
|
||||
CONFIG_MIPS=y
|
||||
# CONFIG_MIPS_ATLAS is not set
|
||||
|
@ -244,7 +243,6 @@ CONFIG_USB_OHCI_HCD=m
|
|||
# CONFIG_USB_UHCI_HCD is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
# CONFIG_VIDEO_ALLOW_V4L1 is not set
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
CONFIG_VIDEO_V4L2_COMMON=m
|
||||
|
|
|
@ -101,7 +101,6 @@ CONFIG_LZO_DECOMPRESS=m
|
|||
# CONFIG_MACH_JAZZ is not set
|
||||
# CONFIG_MACH_VR41XX is not set
|
||||
# CONFIG_MDIO_BITBANG is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MIPS=y
|
||||
# CONFIG_MIPS_ATLAS is not set
|
||||
# CONFIG_MIPS_COBALT is not set
|
||||
|
@ -234,7 +233,6 @@ CONFIG_USB_SUPPORT=y
|
|||
# CONFIG_USB_UHCI_HCD is not set
|
||||
CONFIG_USB_WDM=m
|
||||
# CONFIG_VGASTATE is not set
|
||||
CONFIG_VIDEO_ALLOW_V4L1=y
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L1=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
|
|
|
@ -758,6 +758,7 @@ CONFIG_MAC_PARTITION=y
|
|||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_MARVELL_PHY is not set
|
||||
# CONFIG_MD is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
|
||||
# CONFIG_MEGARAID_LEGACY is not set
|
||||
# CONFIG_MEGARAID_NEWGEN is not set
|
||||
|
@ -1790,6 +1791,7 @@ CONFIG_VFAT_FS=m
|
|||
# CONFIG_VIDEO_ADV7170 is not set
|
||||
# CONFIG_VIDEO_ADV7175 is not set
|
||||
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||
# CONFIG_VIDEO_ALLOW_V4L1 is not set
|
||||
# CONFIG_VIDEO_BT819 is not set
|
||||
# CONFIG_VIDEO_BT848 is not set
|
||||
# CONFIG_VIDEO_BT856 is not set
|
||||
|
|
|
@ -102,7 +102,6 @@ CONFIG_LEDS_IFXMIPS=y
|
|||
# CONFIG_MACH_DECSTATION is not set
|
||||
# CONFIG_MACH_JAZZ is not set
|
||||
# CONFIG_MACH_VR41XX is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MIPS=y
|
||||
# CONFIG_MIPS_ATLAS is not set
|
||||
# CONFIG_MIPS_COBALT is not set
|
||||
|
@ -230,7 +229,6 @@ CONFIG_USB_SUPPORT=y
|
|||
# CONFIG_USB_UHCI_HCD is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
CONFIG_VIDEO_ALLOW_V4L1=y
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L1=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
|
|
|
@ -178,7 +178,6 @@ CONFIG_LZO_DECOMPRESS=m
|
|||
# CONFIG_MACH_GLANTANK is not set
|
||||
CONFIG_MACH_N2100=y
|
||||
# CONFIG_MAC_PARTITION is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MEDIA_TUNER=m
|
||||
# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
|
||||
CONFIG_MEDIA_TUNER_MT20XX=m
|
||||
|
@ -351,7 +350,6 @@ CONFIG_USB_UHCI_HCD=m
|
|||
CONFIG_VECTORS_BASE=0xffff0000
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
CONFIG_VIDEO_ALLOW_V4L1=y
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L1=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
|
|
|
@ -214,7 +214,6 @@ CONFIG_MACH_WG302V1=y
|
|||
CONFIG_MACH_WG302V2=y
|
||||
CONFIG_MACH_WRT300NV2=y
|
||||
# CONFIG_MAC_PARTITION is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MEDIA_TUNER=m
|
||||
# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
|
||||
CONFIG_MEDIA_TUNER_MT20XX=m
|
||||
|
@ -388,7 +387,6 @@ CONFIG_VECTORS_BASE=0xffff0000
|
|||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
CONFIG_VIA_VELOCITY=m
|
||||
CONFIG_VIDEO_ALLOW_V4L1=y
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L1=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
|
|
|
@ -82,7 +82,6 @@ CONFIG_LZO_DECOMPRESS=m
|
|||
# CONFIG_MACINTOSH_DRIVERS is not set
|
||||
CONFIG_MAGICBOX=y
|
||||
# CONFIG_MATH_EMULATION is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MTD=y
|
||||
# CONFIG_MTD_ABSENT is not set
|
||||
CONFIG_MTD_BLKDEVS=y
|
||||
|
@ -181,7 +180,6 @@ CONFIG_UART0_TTYS0=y
|
|||
# CONFIG_UART0_TTYS1 is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
CONFIG_VIDEO_ALLOW_V4L1=y
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L1=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
|
|
|
@ -184,7 +184,6 @@ CONFIG_LZO_DECOMPRESS=m
|
|||
CONFIG_MACH_WNR854T=y
|
||||
CONFIG_MACH_WRT350N_V2=y
|
||||
# CONFIG_MAC_PARTITION is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MEDIA_TUNER=m
|
||||
# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
|
||||
CONFIG_MEDIA_TUNER_MT20XX=m
|
||||
|
@ -368,7 +367,6 @@ CONFIG_VECTORS_BASE=0xffff0000
|
|||
# CONFIG_VFP is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
CONFIG_VIDEO_ALLOW_V4L1=y
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L1=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
|
|
|
@ -96,7 +96,6 @@ CONFIG_LZO_DECOMPRESS=m
|
|||
# CONFIG_MACINTOSH_DRIVERS is not set
|
||||
# CONFIG_MAKALU is not set
|
||||
# CONFIG_MATH_EMULATION is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
# CONFIG_MMIO_NVRAM is not set
|
||||
# CONFIG_MPIC is not set
|
||||
# CONFIG_MPIC_WEIRD is not set
|
||||
|
@ -222,7 +221,6 @@ CONFIG_TASK_SIZE=0xc0000000
|
|||
CONFIG_TICK_ONESHOT=y
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
CONFIG_VIDEO_ALLOW_V4L1=y
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L1=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
|
|
Loading…
Reference in a new issue