Resync x86_64 kernel config and make uml build ext2 images by default

[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 4729f28..e3df421 100644 (file)
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-template
@@ -22,7 +22,7 @@ CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATL1 is not set
 CONFIG_ATM=m
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATL1 is not set
 CONFIG_ATM=m

-CONFIG_ATMEL=m
+# CONFIG_ATMEL is not set

 # CONFIG_ATM_AMBASSADOR is not set
 CONFIG_ATM_BR2684=m
 CONFIG_ATM_BR2684_IPFILTER=y
 # CONFIG_ATM_AMBASSADOR is not set
 CONFIG_ATM_BR2684=m
 CONFIG_ATM_BR2684_IPFILTER=y


@@ -47,9 +47,12 @@ CONFIG_ATM_TCP=m
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
 # CONFIG_AUTOFS_FS is not set
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set

+# CONFIG_B44 is not set

 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
 # CONFIG_BASLER_EXCITE is not set

+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set

 # CONFIG_BAYCOM_SER_FDX is not set
 # CONFIG_BAYCOM_SER_HDX is not set
 CONFIG_BCM43XX=m
 # CONFIG_BAYCOM_SER_FDX is not set
 # CONFIG_BAYCOM_SER_HDX is not set
 CONFIG_BCM43XX=m


@@ -136,7 +139,7 @@ CONFIG_BRIDGE_EBT_T_FILTER=m
 CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_VLAN=m

-CONFIG_BRIDGE_NETFILTER=y
+# CONFIG_BRIDGE_NETFILTER is not set

 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_BSD_DISKLABEL=y


@@ -277,7 +280,7 @@ CONFIG_E100=m
 # CONFIG_EFS_FS is not set
 # CONFIG_ELF_CORE is not set
 CONFIG_EMBEDDED=y
 # CONFIG_EFS_FS is not set
 # CONFIG_ELF_CORE is not set
 CONFIG_EMBEDDED=y

-CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_ENABLE_MUST_CHECK is not set

 # CONFIG_EPIC100 is not set
 CONFIG_EPOLL=y
 # CONFIG_EQUALIZER is not set
 # CONFIG_EPIC100 is not set
 CONFIG_EPOLL=y
 # CONFIG_EQUALIZER is not set


@@ -325,6 +328,8 @@ CONFIG_HAMRADIO=y
 CONFIG_HERMES=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_HERMES=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_HFS_FS=m

+# CONFIG_HID_DEBUG is not set
+# CONFIG_HID_FF is not set

 # CONFIG_HIPPI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_CS=m
 # CONFIG_HIPPI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_CS=m


@@ -339,8 +344,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_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


@@ -595,7 +607,7 @@ CONFIG_JFFS2_RTIME=y
 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS_FS is not set
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS_FS is not set
 # CONFIG_JFS_DEBUG is not set

-CONFIG_JFS_FS=m
+# CONFIG_JFS_FS is not set

 # CONFIG_JFS_POSIX_ACL is not set
 # CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_STATISTICS is not set
 # CONFIG_JFS_POSIX_ACL is not set
 # CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_STATISTICS is not set


@@ -774,6 +786,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


@@ -782,7 +795,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


@@ -790,10 +803,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


@@ -837,8 +858,8 @@ CONFIG_NLS_UTF8=m
 CONFIG_NORTEL_HERMES=m
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NORTEL_HERMES=m
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set

-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set

 # CONFIG_OCFS2_FS is not set
 # CONFIG_OSF_PARTITION is not set
 CONFIG_PACKET=y
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OSF_PARTITION is not set
 CONFIG_PACKET=y


@@ -959,7 +980,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_RAMFS=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_RAMFS=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_REISERFS_CHECK is not set

-CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_FS is not set

 # CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_RELAY is not set
 # CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_RELAY is not set


@@ -1125,7 +1146,7 @@ CONFIG_SLAB=y
 CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set
 CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set

-CONFIG_SMB_FS=m
+# CONFIG_SMB_FS is not set

 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m
 # CONFIG_SND_AD1816A is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m
 # CONFIG_SND_AD1816A is not set


@@ -1340,7 +1361,11 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_EZUSB=y
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_GADGET is not set
 CONFIG_USB_EZUSB=y
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_GADGET is not set

-# CONFIG_USB_HID is not set
+CONFIG_USB_HID=m
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_HIDINPUT=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set

 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_ISP116X_HCD is not set


@@ -1377,7 +1402,7 @@ CONFIG_USB_PEGASUS=m
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_RIO500 is not set

-CONFIG_USB_RTL8150=m
+# CONFIG_USB_RTL8150 is not set

 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_AIRPRIME=m
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_AIRPRIME=m


@@ -1453,8 +1478,8 @@ CONFIG_USB_USBNET_MII=m
 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_XUSBATM is not set
 # CONFIG_USB_WACOM is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_XUSBATM is not set

-# CONFIG_USB_YEALINK is not set
-CONFIG_USB_ZD1201=m
+CONFIG_USB_YEALINK=m
+# CONFIG_USB_ZD1201 is not set

 # CONFIG_UTS_NS is not set
 CONFIG_VFAT_FS=m
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_UTS_NS is not set
 CONFIG_VFAT_FS=m
 # CONFIG_VIA_VELOCITY is not set


@@ -1527,3 +1552,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