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

[openwrt.git] / target / linux / orion / config-default

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 9e2cb14..58729de 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -66,7 +66,7 @@ CONFIG_BOUNCE=y
 # CONFIG_BT is not set
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
+CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
@@ -83,9 +83,6 @@ CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CRC16=y
 # CONFIG_CRC_CCITT is not set
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_GF128MUL=m
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEFAULT_TCP_CONG="westwood"
@@ -184,9 +181,9 @@ CONFIG_LZO_DECOMPRESS=m
 # CONFIG_MACH_TS209 is not set
 # CONFIG_MACH_TS409 is not set
 # CONFIG_MACH_TS78XX 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
@@ -198,6 +195,7 @@ CONFIG_MEDIA_TUNER_TEA5767=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC5000=m
 # CONFIG_MINIX_FS is not set
+# CONFIG_MMC_TEST is not set
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
@@ -313,6 +311,8 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SHMEM is not set
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SOC_CAMERA is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
@@ -359,6 +359,7 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_WDM is not set
@@ -366,12 +367,13 @@ 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
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_USB_VIDEO_CLASS is not set
 CONFIG_WAN=y
 # CONFIG_WANXL is not set
 # CONFIG_XFS_FS is not set