[atheros] sync 2.6.26 config

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

diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index 130c95c..721cf8e 100644 (file)
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -147,6 +147,7 @@ CONFIG_I2C_GPIO=y
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=m
+# CONFIG_INPUT_IXP4XX_BEEPER is not set
 # CONFIG_IP6_NF_MANGLE is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
 # CONFIG_IP6_NF_MATCH_FRAG is not set
@@ -209,11 +210,11 @@ CONFIG_MACH_PRONGHORN=y
 CONFIG_MACH_PRONGHORNMETRO=y
 CONFIG_MACH_SIDEWINDER=y
 CONFIG_MACH_TW5334=y
+CONFIG_MACH_USR8200=y
 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
@@ -280,8 +281,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
-# CONFIG_NET_CLS_ACT is not set
-# CONFIG_NET_CLS_IND is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_SCH_NETEM is not set
@@ -380,13 +379,13 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_SERIAL_MOTOROLA is not set
 # CONFIG_USB_SERIAL_SPCP8X5 is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_WDM is not set
 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