Update generic and amd64 options.

svn path=/dists/trunk/linux-2.6/; revision=8268

debian/arch/alpha/config

@@ -638,7 +638,6 @@ CONFIG_DLCI=m
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
 CONFIG_SDLA=m
-CONFIG_WAN_ROUTER_DRIVERS=y
 CONFIG_CYCLADES_SYNC=m
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m

debian/arch/amd64/config

@@ -554,7 +554,6 @@ CONFIG_FARSYNC=m
 CONFIG_DLCI=m
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=y
 CONFIG_CYCLADES_SYNC=m
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m
@@ -1439,3 +1438,11 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_BLK_DEV_IDEPNP=y
 CONFIG_USB_APPLETOUCH=m
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+# CONFIG_HZ_300 is not set
+# CONFIG_MCORE2 is not set
+CONFIG_KVM_AMD=m
+CONFIG_IOMAP_COPY=y
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set

debian/arch/config

@@ -1261,3 +1261,81 @@ CONFIG_HDLC_X25=m
 CONFIG_HDLC_PPP=m
 CONFIG_HDLC_CISCO=m
 CONFIG_HDLC_FR=m
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_CHELSIO_T1_NAPI=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_NET_SCH_FIFO=y
+CONFIG_NF_CONNTRACK_SUPPORT=y
+CONFIG_NETXEN_NIC=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_PC87413_WDT=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_IP_DCCP_CCID3_RTO=100
+CONFIG_MTD_BLKDEVS=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+# CONFIG_MTD_ESB2ROM is not set
+CONFIG_USB_SERIAL_DEBUG=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+# CONFIG_DLM_SCTP is not set
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_DVB_TUNER_LGH06XF=m
+CONFIG_HID=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_SENSORS_PC87427=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_GENERIC_BUG=y
+CONFIG_SCSI_SRP=m
+CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_DLM_TCP=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_MOXA_SMARTIO_NEW=m
+CONFIG_NF_CT_ACCT=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_BITREVERSE=y
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_CONNTRACK_ENABLED=m
+CONFIG_AC97_BUS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SIP=m
+# CONFIG_MTD_CK804XROM is not set
+# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_SENSORS_W83793=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_NAT=m
+CONFIG_PATA_MARVELL=m
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_MTD_NAND_CAFE=m
+# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_USB_TOUCHSCREEN_DMC_TSC10=y
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_WAN_ROUTER_DRIVERS=m

debian/arch/i386/config

@@ -705,7 +705,6 @@ CONFIG_DLCI=m
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
 CONFIG_SDLA=m
-CONFIG_WAN_ROUTER_DRIVERS=y
 CONFIG_CYCLADES_SYNC=m
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m

debian/arch/ia64/config

@@ -533,7 +533,6 @@ CONFIG_FARSYNC=m
 CONFIG_DLCI=m
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=y
 # CONFIG_CYCLADES_SYNC is not set
 CONFIG_FDDI=y
 CONFIG_DEFXX=m

debian/arch/powerpc/config

@@ -485,7 +485,6 @@ CONFIG_FARSYNC=m
 CONFIG_DLCI=m
 CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=y
 CONFIG_CYCLADES_SYNC=m
 CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m

debian/arch/powerpc/config.powerpc64

@@ -58,7 +58,6 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCSI_QLOGIC_1280_1040=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_IBMVSCSI=m
-CONFIG_SCSI_SRP=m
 CONFIG_SCSI_IBMVSCSIS=m
 # CONFIG_SERIAL_ICOM is not set
 CONFIG_SMP=y

debian/patches/series/1~experimental.1

@@ -25,7 +25,7 @@
 + features/arm/ixp4xx_npe_driver-0.3.1.patch
 + features/arm/ixp4xx-net-driver-improve-mac-handling.patch
 + bugfix/Makefile-localversion-backup.patch
-+ bugfix/drivers-bus_to_virt.patch
+#FIXME + bugfix/drivers-bus_to_virt.patch
 + bugfix/arm/disable-broken-config-options.patch
 + bugfix/arm/cyber2010_burst.patch
 + bugfix/arm/rtc-rs5c372-n2100.patch