aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-02-28 13:00:26 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-02-28 13:00:26 +0000
commit74f71f073998a53fb09409d59df65d1c03e94001 (patch)
tree94e4bc8b94a7256dc263f9f5029531306a038e98 /target/linux
parentf5616580b3dd86d8f6d32636e4418f0fe81fe3f3 (diff)
downloadupstream-74f71f073998a53fb09409d59df65d1c03e94001.tar.gz
upstream-74f71f073998a53fb09409d59df65d1c03e94001.tar.bz2
upstream-74f71f073998a53fb09409d59df65d1c03e94001.zip
fix a small bug in the config merge/split (fixes buildbot error on ixp4xx)
SVN-Revision: 6427
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ixp4xx-2.6/config/default3
1 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default
index 9336723139..7c9fec0d37 100644
--- a/target/linux/ixp4xx-2.6/config/default
+++ b/target/linux/ixp4xx-2.6/config/default
@@ -265,7 +265,7 @@ CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_PLATRAM is not set
# CONFIG_MTD_PMC551 is not set
# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK is not set
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_PARTS_READONLY=y
CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
@@ -331,7 +331,6 @@ CONFIG_PATA_ARTOP=m
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
# CONFIG_PC300 is not set
-# CONFIG_PCMCIA is not set
# CONFIG_PCCARD is not set
# CONFIG_PCI200SYN is not set
# CONFIG_PCIPCWATCHDOG is not set