fix a small bug in the config merge/split (fixes buildbot error on ixp4xx)

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

diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default
index 9336723139b7d8d8e4b69361e8adba03fac8df51..7c9fec0d37439a450ac0818bd3b023c0f62b0a08 100644 (file)
--- 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