[ar71xx] fix GPIO function select bit definitions (based on a patch by Jonas <jmajau...

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

diff --git a/target/linux/generic-2.6/config-2.6.24 b/target/linux/generic-2.6/config-2.6.24
index 9864337..016406f 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.24
+++ b/target/linux/generic-2.6/config-2.6.24
@@ -106,6 +106,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDE_SATA is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDE_SATA is not set

+# CONFIG_BLK_DEV_IDE_SWARM is not set

 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_BLK_DEV_IT8213 is not set
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_BLK_DEV_IT8213 is not set


@@ -118,6 +119,7 @@ CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set

+# CONFIG_BLK_DEV_PLATFORM 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_PIIX is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_RZ1000 is not set


@@ -125,6 +127,7 @@ CONFIG_BLK_DEV_NBD=m
 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

+# CONFIG_BLK_DEV_SL82C105 is not set

 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_SR is not set
 # CONFIG_BLK_DEV_SVWKS is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_SR is not set
 # CONFIG_BLK_DEV_SVWKS is not set


@@ -151,6 +154,7 @@ CONFIG_BRIDGE_EBT_LIMIT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_MARK=m
 CONFIG_BRIDGE_EBT_MARK_T=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_MARK=m
 CONFIG_BRIDGE_EBT_MARK_T=m

+CONFIG_BRIDGE_EBT_NFLOG=m

 CONFIG_BRIDGE_EBT_PKTTYPE=m
 CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_PKTTYPE=m
 CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m


@@ -175,11 +179,13 @@ CONFIG_BT_HCIBFUSB=m
 # CONFIG_BT_HCIBLUECARD is not set
 CONFIG_BT_HCIBPA10X=m
 # CONFIG_BT_HCIBT3C is not set
 # CONFIG_BT_HCIBLUECARD is not set
 CONFIG_BT_HCIBPA10X=m
 # CONFIG_BT_HCIBT3C is not set

+# CONFIG_BT_HCIBTSDIO is not set

 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIDTL1 is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_H4=y
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIDTL1 is not set
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_H4=y

+# CONFIG_BT_HCIUART_LL is not set

 CONFIG_BT_HCIUSB=m
 CONFIG_BT_HCIUSB_SCO=y
 CONFIG_BT_HCIVHCI=m
 CONFIG_BT_HCIUSB=m
 CONFIG_BT_HCIUSB_SCO=y
 CONFIG_BT_HCIVHCI=m


@@ -249,7 +255,7 @@ CONFIG_CRYPTO_ECB=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HMAC=m
 # CONFIG_CRYPTO_GF128MUL is not set
 CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HMAC=m

-CONFIG_CRYPTO_HW=n
+# CONFIG_CRYPTO_HW is not set

 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_KHAZAD=m
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_MANAGER=m


@@ -359,6 +365,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
 # CONFIG_GFS2_FS is not set
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
 # CONFIG_GFS2_FS is not set

+CONFIG_GPIO_DEVICE=m

 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set


@@ -369,6 +376,8 @@ CONFIG_HFS_FS=m
 # CONFIG_HID is not set
 # CONFIG_HID_DEBUG is not set
 # CONFIG_HID_FF is not set
 # CONFIG_HID is not set
 # CONFIG_HID_DEBUG is not set
 # CONFIG_HID_FF is not set

+# CONFIG_HID_SUPPORT is not set
+# CONFIG_HIDRAW is not set

 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
 CONFIG_HOSTAP=m
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
 CONFIG_HOSTAP=m


@@ -410,6 +419,8 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set

+# CONFIG_I2C_IBM_IIC is not set
+# CONFIG_I2C_MPC is not set

 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set


@@ -417,6 +428,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
 # CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set

+# CONFIG_I2C_SIBYTE is not set

 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set


@@ -438,6 +450,13 @@ CONFIG_IDE_MAX_HWIFS=4
 CONFIG_IDE_PROC_FS=y
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
 CONFIG_IDE_PROC_FS=y
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set

+# CONFIG_IEEE1394_DV1394 is not set
+# CONFIG_IEEE1394_ETH1394 is not set
+# CONFIG_IEEE1394_OHCI1394 is not set
+# CONFIG_IEEE1394_PCILYNX is not set
+# CONFIG_IEEE1394_RAWIO is not set
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_VIDEO1394 is not set

 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m


@@ -446,8 +465,8 @@ CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_IFB=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_IFB=m

-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKCONFIG_PROC is not set

 CONFIG_IMQ=m
 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ=m
 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set


@@ -531,6 +550,7 @@ CONFIG_IP6_NF_TARGET_ROUTE=m
 CONFIG_IPSEC_NAT_TRAVERSAL=y
 CONFIG_IPV6=m
 # CONFIG_IPV6_MIP6 is not set
 CONFIG_IPSEC_NAT_TRAVERSAL=y
 CONFIG_IPV6=m
 # CONFIG_IPV6_MIP6 is not set

+# CONFIG_IPV6_MROUTE is not set

 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_IPV6_PRIVACY is not set


@@ -564,12 +584,12 @@ CONFIG_IP_NF_CONNTRACK=y
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_CONNTRACK_MARK=y
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m

-CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_FILTER=m

 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_H323=m
 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_H323=m

-CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_IPTABLES=m

 CONFIG_IP_NF_IRC=m
 CONFIG_IP_NF_IRC=m

-CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_MANGLE=m

 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m


@@ -615,10 +635,10 @@ CONFIG_IP_NF_SIP=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_IMQ=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_IMQ=m
 CONFIG_IP_NF_TARGET_LOG=m

-CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m

 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m

-CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_REJECT=m

 CONFIG_IP_NF_TARGET_ROUTE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_SET=m
 CONFIG_IP_NF_TARGET_ROUTE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_SET=m


@@ -683,8 +703,11 @@ CONFIG_JOLIET=y
 # CONFIG_LASAT is not set
 # CONFIG_LBD is not set
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LASAT is not set
 # CONFIG_LBD is not set
 # CONFIG_LDM_PARTITION is not set

+# CONFIG_LEDS_ALIX is not set

 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS=y

+# CONFIG_LEDS_GPIO is not set

 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGERS=y

+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_MORSE is not set


@@ -724,6 +747,7 @@ CONFIG_MINI_FO=y
 CONFIG_MISC_DEVICES=y
 CONFIG_MKISS=m
 # CONFIG_MMC is not set
 CONFIG_MISC_DEVICES=y
 CONFIG_MKISS=m
 # CONFIG_MMC is not set

+# CONFIG_MMC_ARMMMCI is not set

 CONFIG_MMU=y
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MMU=y
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set


@@ -736,9 +760,12 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y

+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set

 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_NAND is not set
 # CONFIG_MTD_OOPS is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_NAND is not set
 # CONFIG_MTD_OOPS 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


@@ -756,7 +783,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_NETLINK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_NETLINK is not set

-CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XTABLES=m

 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m


@@ -768,10 +795,10 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m

-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m

 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m

-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m

 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m


@@ -779,7 +806,7 @@ CONFIG_NETFILTER_XT_MATCH_PORTSCAN=m
 # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m

-CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STATE=m

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


@@ -794,7 +821,7 @@ 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_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_TARPIT=m

-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m

 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set


@@ -882,13 +909,13 @@ 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=m

 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_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_IPV4=m

 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y


@@ -904,7 +931,7 @@ CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CT_PROTO_GRE=m
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
 CONFIG_NF_CT_PROTO_GRE=m
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set

-CONFIG_NF_NAT=y
+CONFIG_NF_NAT=m

 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_H323=m


@@ -957,7 +984,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


@@ -993,6 +1020,8 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_NETCELL is not set
 # CONFIG_PATA_NS87410 is not set
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_NETCELL is not set
 # CONFIG_PATA_NS87410 is not set

+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OF_PLATFORM is not set

 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTI is not set
 # CONFIG_PATA_OPTIDMA is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTI is not set
 # CONFIG_PATA_OPTIDMA is not set


@@ -1013,7 +1042,7 @@ CONFIG_PATA_PLATFORM=m
 # CONFIG_PATA_WINBOND_VLB is not set
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PATA_WINBOND_VLB is not set
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set

-CONFIG_PCI=y
+# CONFIG_PCI is not set

 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCI_HERMES=m
 # CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCI_HERMES=m
 # CONFIG_PCI_LEGACY is not set


@@ -1107,6 +1136,8 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RTC_CLASS is not set
 CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_CLASS is not set
 CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_MAX6900 is not set

+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set

 # CONFIG_RTL8187 is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
 # CONFIG_RTL8187 is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set


@@ -1164,6 +1195,7 @@ CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_LOWLEVEL=y

+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set

 # CONFIG_SCSI_LPFC is not set
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_LPFC is not set
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_NCR53C406A is not set


@@ -1182,6 +1214,7 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SCSI_SEAGATE is not set
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_SRP is not set
 # CONFIG_SCSI_SEAGATE is not set
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_SRP is not set

+# CONFIG_SCSI_SRP_ATTRS is not set

 # CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set
 # CONFIG_SCSI_STEX is not set
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_SYM53C8XX_2 is not set


@@ -1202,6 +1235,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set

+# CONFIG_SENSORS_ADT7470 is not set

 # CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ATXP1 is not set


@@ -1212,14 +1246,19 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_F71805F is not set

+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set

 # CONFIG_SENSORS_FSCHER is not set
 # CONFIG_SENSORS_FSCHER is not set

+# CONFIG_SENSORS_FSCHMD is not set

 # CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_HDAPS is not set

+# CONFIG_SENSORS_I5K_AMB is not set

 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_K8TEMP is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_K8TEMP is not set
 # CONFIG_SENSORS_LM63 is not set

+# CONFIG_SENSORS_LM70 is not set

 # CONFIG_SENSORS_LM75 is not set
 # CONFIG_SENSORS_LM77 is not set
 # CONFIG_SENSORS_LM78 is not set
 # CONFIG_SENSORS_LM75 is not set
 # CONFIG_SENSORS_LM77 is not set
 # CONFIG_SENSORS_LM78 is not set


@@ -1230,6 +1269,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set

+# CONFIG_SENSORS_M41T00 is not set

 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6875 is not set


@@ -1308,6 +1348,7 @@ CONFIG_SND=m
 # CONFIG_SND_CS4236 is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set
 # CONFIG_SND_CS4236 is not set
 # CONFIG_SND_CS4281 is not set
 # CONFIG_SND_CS46XX is not set

+# CONFIG_SND_CS5530 is not set

 # CONFIG_SND_CS5535AUDIO is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_DARLA24 is not set
 # CONFIG_SND_CS5535AUDIO is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_DARLA24 is not set


@@ -1401,13 +1442,20 @@ CONFIG_SOUND=m
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_SPI is not set
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_SPI is not set

+# CONFIG_SPI_DEBUG is not set

 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_MASTER is not set

+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_TLE62X0 is not set

 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_SSB is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SQUASHFS_VMALLOC is not set
 # CONFIG_SSB is not set

+# CONFIG_SSB_DEBUG is not set
+# CONFIG_SSB_DRIVER_MIPS is not set
+# CONFIG_SSB_PCMCIAHOST is not set
+# CONFIG_SSB_SILENT is not set

 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STANDALONE=y
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STANDALONE=y


@@ -1474,7 +1522,7 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNUSED_SYMBOLS is not set

-CONFIG_USB=m
+# CONFIG_USB is not set

 # CONFIG_USB_ACECAD is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_ACECAD is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_ADUTUX is not set


@@ -1549,6 +1597,7 @@ CONFIG_USB_NET_RNDIS_HOST=m
 CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
 # CONFIG_USB_OHCI_HCD is not set
 CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
 # CONFIG_USB_OHCI_HCD is not set

+# CONFIG_USB_OHCI_HCD_SSB is not set

 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OV511 is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OV511 is not set


@@ -1557,6 +1606,7 @@ CONFIG_USB_PEGASUS=m
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_QUICKCAM_MESSENGER is not set
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_QUICKCAM_MESSENGER is not set

+# CONFIG_USB_R8A66597_HCD is not set

 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SE401 is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SE401 is not set


@@ -1565,6 +1615,7 @@ CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_AIRPRIME=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_AIRPRIME=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m

+CONFIG_USB_SERIAL_CH341=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


@@ -1690,6 +1741,7 @@ CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_SAA7185 is not set
 # CONFIG_VIDEO_SAA7191 is not set
 # CONFIG_VIDEO_STRADIS is not set
 # CONFIG_VIDEO_SAA7185 is not set
 # CONFIG_VIDEO_SAA7191 is not set
 # CONFIG_VIDEO_STRADIS is not set

+# CONFIG_VIDEO_TCM825X is not set

 # CONFIG_VIDEO_TDA7432 is not set
 # CONFIG_VIDEO_TDA9840 is not set
 # CONFIG_VIDEO_TDA9875 is not set
 # CONFIG_VIDEO_TDA7432 is not set
 # CONFIG_VIDEO_TDA9840 is not set
 # CONFIG_VIDEO_TDA9875 is not set


@@ -1705,6 +1757,7 @@ CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_VIVI is not set
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_VIVI is not set

+# CONFIG_VIDEO_VP27SMPX is not set

 # CONFIG_VIDEO_VPX3220 is not set
 # CONFIG_VIDEO_WM8739 is not set
 # CONFIG_VIDEO_WM8775 is not set
 # CONFIG_VIDEO_VPX3220 is not set
 # CONFIG_VIDEO_WM8739 is not set
 # CONFIG_VIDEO_WM8775 is not set


@@ -1715,7 +1768,16 @@ CONFIG_VLAN_8021Q=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_VT is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_VT is not set
 # CONFIG_VXFS_FS is not set

-# CONFIG_W1 is not set
+CONFIG_W1=m
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set

 # CONFIG_W83627HF_WDT is not set
 # CONFIG_W83697HF_WDT is not set
 # CONFIG_W83877F_WDT is not set
 # CONFIG_W83627HF_WDT is not set
 # CONFIG_W83697HF_WDT is not set
 # CONFIG_W83877F_WDT is not set


@@ -1755,4 +1817,3 @@ CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA_FLAG=1

-# CONFIG_GPIO_DEVICE is not set