Resync uml with generic-2.6 kernel config

[openwrt.git] / target / linux / generic-2.6 / config-template

diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template
index 164048a..949d750 100644 (file)
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-template
@@ -293,6 +293,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_FAT_FS=m
 # CONFIG_FB is not set
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_FAT_FS=m
 # CONFIG_FB is not set

+# CONFIG_FB_IBM_GXT4500 is not set

 # CONFIG_FDDI is not set
 # CONFIG_FEALNX is not set
 CONFIG_FIB_RULES=y
 # CONFIG_FDDI is not set
 # CONFIG_FEALNX is not set
 CONFIG_FIB_RULES=y


@@ -338,7 +339,15 @@ CONFIG_HOTPLUG=y
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_HWMON is not set
 # CONFIG_HWMON_VID is not set
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_HWMON is not set
 # CONFIG_HWMON_VID is not set

+CONFIG_HZ=100
+CONFIG_HZ_100=y

 # CONFIG_HZ_1000 is not set
 # CONFIG_HZ_1000 is not set

+# CONFIG_HZ_1024 is not set
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_48 is not set

 # CONFIG_I2C_ALGOPCA is not set
 # CONFIG_I2C_ALGOPCF is not set
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALGOPCA is not set
 # CONFIG_I2C_ALGOPCF is not set
 # CONFIG_I2C_ALI1535 is not set


@@ -623,6 +632,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set

+# CONFIG_MAC_EMUMOUSEBTN is not set

 CONFIG_MAC_PARTITION=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MARKEINS is not set
 CONFIG_MAC_PARTITION=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MARKEINS is not set


@@ -692,7 +702,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m

-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set
 # CONFIG_NETWORK_SECMARK is not set


@@ -771,6 +781,7 @@ CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set

+CONFIG_NF_CONNTRACK=y

 # CONFIG_NF_CONNTRACK_AMANDA is not set
 CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CONNTRACK_AMANDA is not set
 CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set


@@ -779,7 +790,7 @@ CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IPV4=y
 # CONFIG_NF_CONNTRACK_IPV6 is not set
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_IPV4=y
 # CONFIG_NF_CONNTRACK_IPV6 is not set
 CONFIG_NF_CONNTRACK_IRC=m

-# CONFIG_NF_CONNTRACK_MARK is not set
+CONFIG_NF_CONNTRACK_MARK=y

 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y


@@ -787,10 +798,18 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CONNTRACK_TFTP is not set
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CONNTRACK_TFTP is not set

-# CONFIG_NF_CT_ACCT is not set
+CONFIG_NF_CT_ACCT=y

 # CONFIG_NF_CT_PROTO_SCTP is not set
 CONFIG_NF_NAT=y
 # CONFIG_NF_CT_PROTO_SCTP is not set
 CONFIG_NF_NAT=y

+# CONFIG_NF_NAT_AMANDA is not set
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_PPTP is not set
+CONFIG_NF_NAT_SIP=m

 # CONFIG_NF_NAT_SNMP_BASIC is not set
 # CONFIG_NF_NAT_SNMP_BASIC is not set

+# CONFIG_NF_NAT_TFTP is not set

 CONFIG_NLS=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_CODEPAGE_1250=m


@@ -1107,6 +1126,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 # CONFIG_SERIAL_NONSTANDARD is not set

+# CONFIG_SERIAL_UARTLITE is not set

 # CONFIG_SERIO is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_SERIO is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_SGI_PARTITION is not set


@@ -1343,6 +1363,7 @@ CONFIG_USB_EZUSB=y
 CONFIG_USB_KAWETH=m
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_KBTAB is not set
 CONFIG_USB_KAWETH=m
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_KBTAB is not set

+# CONFIG_USB_KC2190 is not set

 # CONFIG_USB_KEYSPAN_REMOTE is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_KEYSPAN_REMOTE is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LD is not set


@@ -1356,6 +1377,7 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_SUBSET=m

+CONFIG_USB_NET_DM9601=m

 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_MCS7830=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_MCS7830=m
 CONFIG_USB_NET_NET1080=m


@@ -1380,6 +1402,7 @@ CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
 CONFIG_USB_SERIAL_CP2101=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m

+# CONFIG_USB_SERIAL_DEBUG is not set

 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m


@@ -1520,3 +1543,5 @@ CONFIG_ZISOFS=y
 CONFIG_ZISOFS_FS=m
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZISOFS_FS=m
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y

+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1