merge netfilter changes to 2.6.27

[openwrt.git] / target / linux / sibyte / config-default

diff --git a/target/linux/sibyte/config-default b/target/linux/sibyte/config-default
index 48d00ec..b0ce7f1 100644 (file)
--- a/target/linux/sibyte/config-default
+++ b/target/linux/sibyte/config-default
@@ -25,6 +25,7 @@ CONFIG_CFE=y
 CONFIG_CLASSIC_RCU=y
 # CONFIG_CLS_U32_MARK is not set
 # CONFIG_CLS_U32_PERF is not set
 CONFIG_CLASSIC_RCU=y
 # CONFIG_CLS_U32_MARK is not set
 # CONFIG_CLS_U32_PERF is not set

+CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=duart0,115200 init=/etc/preinit"

 CONFIG_COMPAT=y
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_CONNECTOR=m
 CONFIG_COMPAT=y
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_CONNECTOR=m


@@ -98,7 +99,7 @@ CONFIG_HZ_250=y
 # CONFIG_IEEE80211 is not set
 CONFIG_INITRAMFS_ROOT_GID=0
 CONFIG_INITRAMFS_ROOT_UID=0
 # CONFIG_IEEE80211 is not set
 CONFIG_INITRAMFS_ROOT_GID=0
 CONFIG_INITRAMFS_ROOT_UID=0

-CONFIG_INITRAMFS_SOURCE="../root"
+CONFIG_INITRAMFS_SOURCE="../../root"

 CONFIG_INPUT=m
 # CONFIG_IP6_NF_MATCH_FRAG is not set
 # CONFIG_IP6_NF_MATCH_HL is not set
 CONFIG_INPUT=m
 # CONFIG_IP6_NF_MATCH_FRAG is not set
 # CONFIG_IP6_NF_MATCH_HL is not set


@@ -122,9 +123,13 @@ CONFIG_IRQ_CPU=y
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set

+# CONFIG_MACH_EMMA is not set

 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_JAZZ is not set

+# CONFIG_MACH_TX39XX is not set
+# CONFIG_MACH_TX49XX is not set

 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MDIO_BITBANG is not set

+# CONFIG_MIKROTIK_RB532 is not set

 CONFIG_MINI_FO=m
 CONFIG_MIPS=y
 CONFIG_MIPS32_COMPAT=y
 CONFIG_MINI_FO=m
 CONFIG_MIPS=y
 CONFIG_MIPS32_COMPAT=y


@@ -133,6 +138,7 @@ CONFIG_MIPS32_O32=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5

+# CONFIG_MIPS_MACHINE is not set

 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_MT_DISABLED=y
 # CONFIG_MIPS_MT_SMP is not set


@@ -188,6 +194,8 @@ CONFIG_MTD_PHYSMAP_START=0x8000000
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NO_IOPORT is not set

+# CONFIG_NXP_STB220 is not set
+# CONFIG_NXP_STB225 is not set

 # CONFIG_N_HDLC is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_N_HDLC is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_PAGE_SIZE_16KB is not set


@@ -202,6 +210,7 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_SYNC_TTY is not set

+# CONFIG_PROBE_INITRD_HEADER is not set

 # CONFIG_PROC_KCORE is not set
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_REALTEK_PHY is not set
 # CONFIG_PROC_KCORE is not set
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_REALTEK_PHY is not set