aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120-2.6/config
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-06-08 12:58:55 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-06-08 12:58:55 +0000
commitd28ca51872a803f9073dd72bce7208f5e05c62c6 (patch)
tree9d7448ad0a3a5eb2e43c41159e2ade4d40a464fe /target/linux/adm5120-2.6/config
parenta014690ed69fe7d48d8483393d8dd8a5177698b0 (diff)
downloadupstream-d28ca51872a803f9073dd72bce7208f5e05c62c6.tar.gz
upstream-d28ca51872a803f9073dd72bce7208f5e05c62c6.tar.bz2
upstream-d28ca51872a803f9073dd72bce7208f5e05c62c6.zip
Resync adm5120 kernel config, lzma-loader fixes from Gabor
SVN-Revision: 7536
Diffstat (limited to 'target/linux/adm5120-2.6/config')
-rw-r--r--target/linux/adm5120-2.6/config/default6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index f4361a9c8c..d83efc2baf 100644
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -15,7 +15,7 @@ CONFIG_CIFS_EXPERIMENTAL=y
CONFIG_CIFS_STATS2=y
CONFIG_CIFS_WEAK_PW_HASH=y
CONFIG_CIFS_XATTR=y
-CONFIG_CMDLINE="console=ttyS0,115200 rootfs=jffs2,squashfs init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,115200 rootfs=jffs2,squashfs,yaffs2 init=/etc/preinit"
# CONFIG_CPU_BIG_ENDIAN is not set
CONFIG_CPU_HAS_LLSC=y
CONFIG_CPU_HAS_PREFETCH=y
@@ -63,8 +63,6 @@ CONFIG_GENERIC_GPIO=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HID=y
-# 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
@@ -88,6 +86,7 @@ CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_TUNNEL=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IRQ_CPU=y
# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_POSIX_ACL=y
@@ -268,7 +267,6 @@ CONFIG_USB_ADM5120_HCD=y
# CONFIG_USB_UHCI_HCD is not set
# CONFIG_USB_USBNET is not set
# CONFIG_USB_USBNET_MII is not set
-CONFIG_USB_YEALINK=m
# CONFIG_USB_ZD1201 is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_YAFFS_9BYTE_TAGS=y