move CONFIG_MEDIA_ATTACH & CONFIG_VIDEO_ALLOW_V4L1 to generic config and disable...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12692 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26
index b00b4cd..415d039 100644 (file)
--- a/target/linux/adm5120/router_be/config-2.6.26
+++ b/target/linux/adm5120/router_be/config-2.6.26
@@ -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_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
 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m

diff --git a/target/linux/adm5120/router_le/config-2.6.26 b/target/linux/adm5120/router_le/config-2.6.26
index 17042d7..3bca3a5 100644 (file)
--- a/target/linux/adm5120/router_le/config-2.6.26
+++ b/target/linux/adm5120/router_le/config-2.6.26
@@ -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_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
 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m

diff --git a/target/linux/ar71xx/config-2.6.26 b/target/linux/ar71xx/config-2.6.26
index b735675..86bde5d 100644 (file)
--- a/target/linux/ar71xx/config-2.6.26
+++ b/target/linux/ar71xx/config-2.6.26
@@ -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_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
 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m

diff --git a/target/linux/atheros/config-2.6.26 b/target/linux/atheros/config-2.6.26
index 30d0406..79f0784 100644 (file)
--- a/target/linux/atheros/config-2.6.26
+++ b/target/linux/atheros/config-2.6.26
@@ -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_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
 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m

diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 2cbe2f9..1191760 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -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_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
 # 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_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
 # CONFIG_VIDEO_BT819 is not set
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_BT856 is not set

diff --git a/target/linux/ifxmips/config-2.6.26 b/target/linux/ifxmips/config-2.6.26
index 77cc5ce..9b50667 100644 (file)
--- a/target/linux/ifxmips/config-2.6.26
+++ b/target/linux/ifxmips/config-2.6.26
@@ -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_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
 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m

diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index 7e5e312..0555e80 100644 (file)
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -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_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
 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m

diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index 1ea21c9..3dc8ecf 100644 (file)
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -214,7 +214,6 @@ CONFIG_MACH_WG302V1=y
 CONFIG_MACH_WG302V2=y
 CONFIG_MACH_WRT300NV2=y
 # CONFIG_MAC_PARTITION is not set
 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
 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m

diff --git a/target/linux/magicbox/config-default b/target/linux/magicbox/config-default
index 1dd406b..1e0b111 100644 (file)
--- a/target/linux/magicbox/config-default
+++ b/target/linux/magicbox/config-default
@@ -82,7 +82,6 @@ CONFIG_LZO_DECOMPRESS=m
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAGICBOX=y
 # CONFIG_MATH_EMULATION is not set
 # 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
 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 9221b42..58729de 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -184,7 +184,6 @@ CONFIG_LZO_DECOMPRESS=m
 CONFIG_MACH_WNR854T=y
 CONFIG_MACH_WRT350N_V2=y
 # CONFIG_MAC_PARTITION is not set
 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
 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m

diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default
index baf8551..df26987 100644 (file)
--- a/target/linux/ppc40x/config-default
+++ b/target/linux/ppc40x/config-default
@@ -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_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
 # 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_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
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m