[adm5120] refresh patches to match upstream style

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

diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22
index 1b0be47..a09e0af 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.22
+++ b/target/linux/generic-2.6/config-2.6.22
@@ -19,9 +19,9 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARPD=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA is not set
 CONFIG_ARPD=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA is not set

-# CONFIG_ATA_GENERIC is not set

 # CONFIG_ATALK is not set
 # CONFIG_ATARI_PARTITION is not set
 # CONFIG_ATALK is not set
 # CONFIG_ATARI_PARTITION is not set

+# CONFIG_ATA_GENERIC is not set

 # 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


@@ -31,6 +31,7 @@ CONFIG_ATM_BR2684=m
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_CLIP_NO_ICMP=y
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_CLIP_NO_ICMP=y

+# CONFIG_ATM_DRIVERS is not set

 CONFIG_ATM_DUMMY=m
 # CONFIG_ATM_ENI is not set
 # CONFIG_ATM_FIRESTREAM is not set
 CONFIG_ATM_DUMMY=m
 # CONFIG_ATM_ENI is not set
 # CONFIG_ATM_FIRESTREAM is not set


@@ -88,9 +89,14 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_DELKIN is not set
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_DELKIN is not set
 # CONFIG_BLK_DEV_FD is not set

+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set

 # CONFIG_BLK_DEV_IDECD is not set
 # CONFIG_BLK_DEV_IDECD is not set

-# CONFIG_BLK_DEV_IDEFLOPPY is not set

 # CONFIG_BLK_DEV_IDECS is not set
 # CONFIG_BLK_DEV_IDECS is not set

+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set

 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEPNP is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEPNP is not set
 # CONFIG_BLK_DEV_IDESCSI is not set


@@ -111,6 +117,7 @@ CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_RZ1000 is not set
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_RZ1000 is not set

+# CONFIG_BLK_DEV_SC1200 is not set

 CONFIG_BLK_DEV_SD=m
 # CONFIG_BLK_DEV_SIIMAGE is not set
 # CONFIG_BLK_DEV_SIS5513 is not set
 CONFIG_BLK_DEV_SD=m
 # CONFIG_BLK_DEV_SIIMAGE is not set
 # CONFIG_BLK_DEV_SIS5513 is not set


@@ -123,6 +130,7 @@ CONFIG_BLK_DEV_SD=m
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_UMEM is not set

+# CONFIG_BLK_DEV_VIA82CXXX is not set

 CONFIG_BLOCK=y
 # CONFIG_BNX2 is not set
 CONFIG_BONDING=m
 CONFIG_BLOCK=y
 # CONFIG_BNX2 is not set
 CONFIG_BONDING=m


@@ -186,7 +194,7 @@ CONFIG_CARDBUS=y
 # CONFIG_CASSINI is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_CASSINI is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CDROM_PKTCDVD is not set

-CONFIG_CFG80211=m
+# CONFIG_CFG80211 is not set

 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_CHR_DEV_OSST is not set
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_CHR_DEV_OSST is not set


@@ -216,19 +224,19 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AES=m
 CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AES=m

-CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI=m

 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m

-CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER=m

 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_BLOWFISH=m

-# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_CAMELLIA=m

 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m

-CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CBC=m

 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_CRC32C=m
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_DEFLATE=m

-CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DES=m

 CONFIG_CRYPTO_ECB=m
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_ECB=m
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_GF128MUL is not set


@@ -236,9 +244,9 @@ CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_LRW is not set

-CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER=m

 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD4=m

-CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MD5=m

 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=m
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=m
 # CONFIG_CRYPTO_PCBC is not set


@@ -386,6 +394,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_ELEKTOR is not set
 # CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_ELEKTOR is not set
 # CONFIG_I2C_GPIO is not set

+# CONFIG_I2C_GPIO_CUSTOM is not set

 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_NFORCE2 is not set


@@ -407,10 +416,12 @@ CONFIG_HZ_100=y
 # CONFIG_I2O is not set
 # CONFIG_I82092 is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_I2O is not set
 # CONFIG_I82092 is not set
 # CONFIG_ICPLUS_PHY is not set

-CONFIG_IDE_MAX_HWIFS=4

 # CONFIG_IDEDISK_MULTI_MODE is not set
 # CONFIG_IDEDISK_MULTI_MODE is not set

-# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDE_MAX_HWIFS=4

 CONFIG_IDE_PROC_FS=y
 CONFIG_IDE_PROC_FS=y

+# CONFIG_IDE_TASK_IOCTL is not set

 # CONFIG_IEEE1394 is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 # CONFIG_IEEE1394 is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_CCMP=m


@@ -444,9 +455,9 @@ CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_TUNNEL=m

-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m

 CONFIG_INET_XFRM_TUNNEL=m
 # CONFIG_INFINIBAND is not set
 # CONFIG_INFTL is not set
 CONFIG_INET_XFRM_TUNNEL=m
 # CONFIG_INFINIBAND is not set
 # CONFIG_INFTL is not set


@@ -486,8 +497,7 @@ CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m

-CONFIG_IP6_NF_MATCH_LIMIT=m
-# CONFIG_IP6_NF_MATCH_MH is not set
+CONFIG_IP6_NF_MATCH_MH=m

 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RT=m


@@ -534,7 +544,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_CONNTRACK=y
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_CONNTRACK=y
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
 CONFIG_IP_NF_CONNTRACK_MARK=y

-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set

 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FILTER=y


@@ -549,8 +558,6 @@ CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPP2P=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPP2P=m
 CONFIG_IP_NF_MATCH_IPRANGE=m

-CONFIG_IP_NF_MATCH_LAYER7=m
-# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set

 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_SET=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_SET=m


@@ -577,6 +584,7 @@ CONFIG_IP_NF_SET_IPHASH=m
 CONFIG_IP_NF_SET_IPMAP=m
 CONFIG_IP_NF_SET_IPPORTHASH=m
 CONFIG_IP_NF_SET_IPTREE=m
 CONFIG_IP_NF_SET_IPMAP=m
 CONFIG_IP_NF_SET_IPPORTHASH=m
 CONFIG_IP_NF_SET_IPTREE=m

+CONFIG_IP_NF_SET_IPTREEMAP=m

 CONFIG_IP_NF_SET_MACIPMAP=m
 CONFIG_IP_NF_SET_MAX=256
 CONFIG_IP_NF_SET_NETHASH=m
 CONFIG_IP_NF_SET_MACIPMAP=m
 CONFIG_IP_NF_SET_MAX=256
 CONFIG_IP_NF_SET_NETHASH=m


@@ -588,12 +596,11 @@ CONFIG_IP_NF_TARGET_IMQ=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=m

-CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_TARGET_REDIRECT=m

 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_ROUTE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_SET=m
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_ROUTE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_SET=m

-CONFIG_IP_NF_TARGET_TCPMSS=y

 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_TARGET_ULOG=m


@@ -654,8 +661,9 @@ CONFIG_JOLIET=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y

-CONFIG_LEDS_TRIGGER_TIMER=y

 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set

+# CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_TIMER=y

 # CONFIG_LEGACY_PTYS is not set
 CONFIG_LIBCRC32C=m
 # CONFIG_LIBERTAS is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_LIBCRC32C=m
 # CONFIG_LIBERTAS is not set


@@ -663,16 +671,16 @@ CONFIG_LIBCRC32C=m
 CONFIG_LLC=y
 CONFIG_LLC2=m
 CONFIG_LOCALVERSION=""
 CONFIG_LLC=y
 CONFIG_LLC2=m
 CONFIG_LOCALVERSION=""

-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set

 CONFIG_LOCKD=m
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set

-CONFIG_MAC80211=m
+# CONFIG_MAC80211 is not set

 # CONFIG_MAC80211_DEBUG is not set
 # CONFIG_MAC80211_DEBUG is not set

-CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_LEDS is not set

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


@@ -698,6 +706,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_MTD_NAND is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_MTD_NAND is not set

+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set

 CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_UBI is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_UBI is not set


@@ -715,7 +724,7 @@ CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m

-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m

 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m


@@ -734,9 +743,11 @@ CONFIG_NETFILTER_XT_MATCH_PORTSCAN=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y

+CONFIG_NETFILTER_XT_MATCH_LAYER7=m
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set

 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m

-CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m

 CONFIG_NETFILTER_XT_TARGET_CHAOS=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CHAOS=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m


@@ -746,6 +757,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_TARPIT=m

 CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set


@@ -826,34 +838,35 @@ CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
 CONFIG_NF_CONNTRACK=y
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
 CONFIG_NF_CONNTRACK=y

-# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_AMANDA=m

 CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IPV4=y

-# CONFIG_NF_CONNTRACK_IPV6 is not set
+CONFIG_NF_CONNTRACK_IPV6=m

 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set

-# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PPTP=m

 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y

+CONFIG_NF_CONNTRACK_RTSP=m

 # CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m
 # CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m

-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
+CONFIG_NF_CONNTRACK_TFTP=m

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

-# CONFIG_NF_NAT_AMANDA is not set
+CONFIG_NF_NAT_AMANDA=m

 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_NEEDED=y
 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_PPTP=m
+CONFIG_NF_NAT_RTSP=m

 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_SIP=m

-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_TFTP=m

 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


@@ -895,7 +908,7 @@ CONFIG_NLS_KOI8_R=m
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=m
 CONFIG_NORTEL_HERMES=m
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=m
 CONFIG_NORTEL_HERMES=m

-CONFIG_NO_HZ=y
+# CONFIG_NO_HZ is not set

 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set


@@ -972,6 +985,7 @@ CONFIG_PCI_HERMES=m
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_PCNET32 is not set
 # CONFIG_PD6729 is not set
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_PCNET32 is not set
 # CONFIG_PD6729 is not set

+# CONFIG_PDC_ADMA is not set

 # CONFIG_PHANTOM is not set
 # CONFIG_PHONE is not set
 # CONFIG_PHYLIB is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_PHONE is not set
 # CONFIG_PHYLIB is not set


@@ -1042,7 +1056,6 @@ CONFIG_RTC_DRV_CMOS=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
 # CONFIG_SATA_AHCI is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
 # CONFIG_SATA_AHCI is not set

-# CONFIG_PDC_ADMA is not set

 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set


@@ -1203,6 +1216,7 @@ CONFIG_SLHC=m
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m

+# CONFIG_SND_AC97_POWER_SAVE is not set

 # CONFIG_SND_AD1816A is not set
 # CONFIG_SND_AD1848 is not set
 # CONFIG_SND_AD1889 is not set
 # CONFIG_SND_AD1816A is not set
 # CONFIG_SND_AD1848 is not set
 # CONFIG_SND_AD1889 is not set