kernel config resync with generic-2.6

[openwrt.git] / target / linux / brcm63xx-2.6 / config / default

diff --git a/target/linux/brcm63xx-2.6/config/default b/target/linux/brcm63xx-2.6/config/default
index ff3e7d3..9a29daf 100644 (file)
--- a/target/linux/brcm63xx-2.6/config/default
+++ b/target/linux/brcm63xx-2.6/config/default
@@ -6,7 +6,6 @@ CONFIG_32BIT=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_AUDIT=y
 CONFIG_AUDIT_GENERIC=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_AUDIT=y
 CONFIG_AUDIT_GENERIC=y

-# CONFIG_B44 is not set

 CONFIG_BASE_SMALL=0
 CONFIG_BCM963XX=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BASE_SMALL=0
 CONFIG_BCM963XX=y
 CONFIG_BINFMT_MISC=m


@@ -106,8 +105,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=m
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=m

-# CONFIG_HID_DEBUG is not set
-# CONFIG_HID_FF is not set

 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y


@@ -353,7 +350,6 @@ CONFIG_TRAD_SIGNALS=y
 # CONFIG_USB_EHCI_HCD is not set
 # CONFIG_USB_GTCO is not set
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_EHCI_HCD is not set
 # CONFIG_USB_GTCO is not set
 # CONFIG_USB_UHCI_HCD is not set

-CONFIG_USB_YEALINK=m

 # CONFIG_VIA_RHINE is not set
 CONFIG_VLAN_8021Q=m
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VIA_RHINE is not set
 CONFIG_VLAN_8021Q=m
 CONFIG_VM_EVENT_COUNTERS=y