Fix brcm63xx patch (humm diff laught at me)

[openwrt.git] / target / linux / uml-2.6 / config

diff --git a/target/linux/uml-2.6/config b/target/linux/uml-2.6/config
index 82433d9..b44ca40 100644 (file)
--- a/target/linux/uml-2.6/config
+++ b/target/linux/uml-2.6/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17

-# Tue Jul 18 01:55:58 2006
+# Thu Jul 20 13:48:28 2006

 #
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_UML=y
 #
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_UML=y


@@ -77,8 +77,8 @@ CONFIG_LD_SCRIPT_DYN=y
 CONFIG_NET=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_NET=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set

-CONFIG_HOSTFS=y
-CONFIG_HPPFS=y
+# CONFIG_HOSTFS is not set
+# CONFIG_HPPFS is not set

 CONFIG_MCONSOLE=y
 # CONFIG_MAGIC_SYSRQ is not set
 CONFIG_NEST_LEVEL=0
 CONFIG_MCONSOLE=y
 # CONFIG_MAGIC_SYSRQ is not set
 CONFIG_NEST_LEVEL=0


@@ -106,9 +106,7 @@ CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_RELAY is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_RELAY is not set

-CONFIG_INITRAMFS_SOURCE="../../root"
-CONFIG_INITRAMFS_ROOT_UID=0
-CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_INITRAMFS_SOURCE=""

 CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_EMBEDDED=y


@@ -166,7 +164,9 @@ CONFIG_BLK_DEV_COW_COMMON=y
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m

-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096

 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_ATA_OVER_ETH is not set
 
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_ATA_OVER_ETH is not set
 


@@ -184,13 +184,13 @@ CONFIG_XTERM_CHAN=y
 # CONFIG_NOCONFIG_CHAN is not set
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CON_CHAN="xterm"
 # CONFIG_NOCONFIG_CHAN is not set
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CON_CHAN="xterm"

-CONFIG_SSL_CHAN="pty"
+CONFIG_SSL_CHAN="xterm"

 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_SOFT_WATCHDOG=m

-CONFIG_UML_WATCHDOG=m
+# CONFIG_UML_WATCHDOG is not set

 # CONFIG_UML_SOUND is not set
 # CONFIG_SOUND is not set
 # CONFIG_HOSTAUDIO is not set
 # CONFIG_UML_SOUND is not set
 # CONFIG_SOUND is not set
 # CONFIG_HOSTAUDIO is not set


@@ -529,7 +529,7 @@ CONFIG_UML_NET_SLIP=y
 CONFIG_UML_NET_DAEMON=y
 CONFIG_UML_NET_MCAST=y
 # CONFIG_UML_NET_PCAP is not set
 CONFIG_UML_NET_DAEMON=y
 CONFIG_UML_NET_MCAST=y
 # CONFIG_UML_NET_PCAP is not set

-CONFIG_UML_NET_SLIRP=y
+# CONFIG_UML_NET_SLIRP is not set

 
 #
 # Network device support
 
 #
 # Network device support


@@ -589,12 +589,12 @@ CONFIG_CONNECTOR=m
 #
 # File systems
 #
 #
 # File systems
 #

-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y

 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set

-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y

 # CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT3_FS_XATTR is not set

-CONFIG_JBD=m
+CONFIG_JBD=y

 # CONFIG_JBD_DEBUG is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_JBD_DEBUG is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set