aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120-2.6/config
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-05-20 21:29:49 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-05-20 21:29:49 +0000
commit301e5914b40ec9729041d8072f5da11559693e74 (patch)
tree8fb7ce51a33d3937f496aa3b5e667a51b27e3fcd /target/linux/adm5120-2.6/config
parentc9733cc9da5b3fec8bb77f0a83b1e3a8d6c910fe (diff)
downloadupstream-301e5914b40ec9729041d8072f5da11559693e74.tar.gz
upstream-301e5914b40ec9729041d8072f5da11559693e74.tar.bz2
upstream-301e5914b40ec9729041d8072f5da11559693e74.zip
Disable PCMCIA for adm5120, request IRQ for the USB driver, fix duplicate lines in the GPIO code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7293 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120-2.6/config')
-rw-r--r--target/linux/adm5120-2.6/config/default3
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120-2.6/config/default
index 3252f043fc..98b5a9d866 100644
--- a/target/linux/adm5120-2.6/config/default
+++ b/target/linux/adm5120-2.6/config/default
@@ -17,7 +17,6 @@ CONFIG_CMDLINE="console=ttyS0,115200 rootfs=jffs2,squashfs init=/etc/preinit"
CONFIG_CPU_HAS_LLSC=y
CONFIG_CPU_HAS_PREFETCH=y
CONFIG_CPU_HAS_SYNC=y
-CONFIG_GENERIC_GPIO=y
CONFIG_CPU_LITTLE_ENDIAN=y
CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
@@ -56,6 +55,7 @@ CONFIG_FS_MBCACHE=m
CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_ACL=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_GPIO=y
# CONFIG_GEN_RTC is not set
CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -201,6 +201,7 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_64KB is not set
# CONFIG_PAGE_SIZE_8KB is not set
# CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_PCCARD is not set
# CONFIG_PCIPCWATCHDOG is not set
CONFIG_PCI_ADM5120=y
# CONFIG_PMC_YOSEMITE is not set