Resync kernel config, preliminary bandwidth control mgmt for the adm5120 switch

[openwrt/svn-archive/archive.git] / target / linux / adm5120-2.6 / config / default

diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index d83efc2baf063f7cede7bdb804bde4cfe34cc195..eae47ce5ab06cde7a8f5e8dd07ac7933562b39d9 100644 (file)
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -62,7 +62,7 @@ CONFIG_GENERIC_GPIO=y
 # CONFIG_GEN_RTC is not set
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
-CONFIG_HID=y
+CONFIG_HID=m
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y
@@ -144,7 +144,7 @@ CONFIG_MTD_BLOCK2MTD=y
 CONFIG_MTD_CFI=y
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_AMDSTD_FORCE_BOTTOM_BOOT=y
+CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
@@ -234,7 +234,6 @@ CONFIG_SERIO_SERPORT=y
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SND_USB_AUDIO is not set
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SYSVIPC_SYSCTL=y
@@ -253,21 +252,44 @@ CONFIG_USB=y
 # CONFIG_USBPCWATCHDOG is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_ADM5120_HCD=y
-# CONFIG_USB_ATM is not set
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
 # CONFIG_USB_CATC is not set
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ET61X251 is not set
 # CONFIG_USB_GTCO is not set
+# CONFIG_USB_IBMCAM is not set
 # CONFIG_USB_KAWETH is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OV511 is not set
 # CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_USB_QUICKCAM_MESSENGER is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_SE401 is not set
 # CONFIG_USB_SERIAL is not set
-# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_STV680 is not set
 # CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_ZC0301 is not set
 # CONFIG_USB_ZD1201 is not set
+# CONFIG_VIDEO_CPIA is not set
+CONFIG_VIDEO_CPIA2=m
+# CONFIG_VIDEO_STRADIS is not set
+CONFIG_VIDEO_V4L1=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_YAFFS_9BYTE_TAGS=y
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set