- Remove x86_64-smp-alternatives.patch - included upstream

- drop obsolete configure options for amd64 - this needs to be checked 
  on every other architecture too. 
  If I removed an option needed for any other architecture, this needs 
  to be added to the corresponding arch/<arch>/config instead of the 
  global one.

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

debian/arch/amd64/config

@@ -6,8 +6,6 @@ CONFIG_X86_CMPXCHG=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_KOBJECT_UEVENT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_EMBEDDED is not set
@@ -22,7 +20,6 @@ CONFIG_X86_LOCAL_APIC=y
 CONFIG_MTRR=y
 CONFIG_HPET_TIMER=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_GART_IOMMU=y
 CONFIG_SWIOTLB=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
@@ -34,8 +31,6 @@ CONFIG_PM=y
 CONFIG_SOFTWARE_SUSPEND=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SLEEP_PROC_FS=y
 CONFIG_ACPI_AC=m
@@ -50,10 +45,8 @@ CONFIG_ACPI_IBM=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_CPU_FREQ=y
@@ -77,12 +70,9 @@ CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_PCI=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
-# CONFIG_UNORDERED_IO is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
@@ -139,7 +129,6 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I8 is not set
 CONFIG_MTD_CFI_INTELEXT=m
 CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_AMDSTD_RETRY=0
 CONFIG_MTD_CFI_STAA=m
 CONFIG_MTD_CFI_UTIL=m
 CONFIG_MTD_RAM=m
@@ -155,7 +144,6 @@ CONFIG_MTD_SC520CDP=m
 CONFIG_MTD_NETSC520=m
 CONFIG_MTD_TS5500=m
 CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_ELAN_104NC=m
 # CONFIG_MTD_AMD76XROM is not set
 # CONFIG_MTD_ICHXROM is not set
 # CONFIG_MTD_SCB2_FLASH is not set
@@ -172,7 +160,6 @@ CONFIG_MTD_PHRAM=m
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLKMTD=m
 CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_DOC2000=m
 CONFIG_MTD_DOC2001=m
@@ -283,7 +270,6 @@ CONFIG_BLK_DEV_NS87415=m
 CONFIG_BLK_DEV_PDC202XX_OLD=m
 CONFIG_PDC202XX_BURST=y
 CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_PDC202XX_FORCE=y
 CONFIG_BLK_DEV_SVWKS=m
 CONFIG_BLK_DEV_SIIMAGE=m
 CONFIG_BLK_DEV_SIS5513=m
@@ -321,14 +307,12 @@ CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
 CONFIG_SCSI_IPR=m
 # CONFIG_SCSI_IPR_TRACE is not set
 # CONFIG_SCSI_IPR_DUMP is not set
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLOGIC_1280_1040=y
 CONFIG_SCSI_LPFC=m
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
@@ -351,16 +335,12 @@ CONFIG_IEEE1394_SBP2=m
 CONFIG_IEEE1394_ETH1394=m
 CONFIG_IEEE1394_DV1394=m
 CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
 CONFIG_I2O=m
 CONFIG_I2O_CONFIG=m
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
 # CONFIG_IP_PNP is not set
-CONFIG_IP_TCPDIAG=m
-CONFIG_IP_TCPDIAG_IPV6=y
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -408,7 +388,6 @@ CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_QOS=y
 CONFIG_NET_ESTIMATOR=y
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
@@ -492,7 +471,6 @@ CONFIG_BT_HCIUSB_SCO=y
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIUART_BCSP_TXCRC is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -563,7 +541,6 @@ CONFIG_TIGON3=m
 CONFIG_BNX2=m
 CONFIG_IXGB=m
 CONFIG_S2IO=m
-# CONFIG_2BUFF_MODE is not set
 CONFIG_TR=y
 CONFIG_IBMOL=m
 CONFIG_3C359=m
@@ -602,7 +579,6 @@ CONFIG_DSCC4=m
 CONFIG_DSCC4_PCISYNC=y
 CONFIG_DSCC4_PCI_RST=y
 CONFIG_LANMEDIA=m
-CONFIG_SYNCLINK_SYNCPPP=m
 CONFIG_HDLC=m
 CONFIG_HDLC_RAW=y
 CONFIG_HDLC_RAW_ETH=y
@@ -811,9 +787,7 @@ CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_VORTEX=m
 CONFIG_GAMEPORT_FM801=m
-CONFIG_GAMEPORT_CS461X=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
@@ -833,13 +807,11 @@ CONFIG_STALDRV=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_ACPI=y
 CONFIG_SERIAL_8250_NR_UARTS=16
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_MULTIPORT=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
@@ -878,7 +850,6 @@ CONFIG_PCIPCWATCHDOG=m
 CONFIG_WDTPCI=m
 CONFIG_WDT_501_PCI=y
 CONFIG_USBPCWATCHDOG=m
-CONFIG_HW_RANDOM=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
 CONFIG_GEN_RTC=m
@@ -935,7 +906,6 @@ CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_VOODOO3=m
 CONFIG_I2C_PCA_ISA=m
-CONFIG_I2C_SENSOR=m
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
@@ -971,17 +941,11 @@ CONFIG_SENSORS_DS1337=m
 CONFIG_SENSORS_EEPROM=m
 CONFIG_SENSORS_PCF8574=m
 CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 CONFIG_W1=m
-CONFIG_W1_MATROX=m
-CONFIG_W1_DS9490=m
-CONFIG_W1_DS9490_BRIDGE=m
-CONFIG_W1_THERM=m
-CONFIG_W1_SMEM=m
 CONFIG_IBM_ASM=m
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_BT848=m
@@ -1021,21 +985,16 @@ CONFIG_DVB_BUDGET_AV=m
 CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
-CONFIG_DVB_DIBUSB=m
-# CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES is not set
-# CONFIG_DVB_DIBCOM_DEBUG is not set
 CONFIG_DVB_CINERGYT2=m
 # CONFIG_DVB_CINERGYT2_TUNING is not set
 CONFIG_DVB_B2C2_FLEXCOP=m
 CONFIG_DVB_B2C2_FLEXCOP_PCI=m
 CONFIG_DVB_B2C2_FLEXCOP_USB=m
 # CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-CONFIG_DVB_B2C2_SKYSTAR=m
 CONFIG_DVB_BT8XX=m
 CONFIG_DVB_STV0299=m
 CONFIG_DVB_CX24110=m
 CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA80XX=m
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1X93=m
 CONFIG_DVB_SP8870=m
@@ -1048,11 +1007,9 @@ CONFIG_DVB_NXT6000=m
 CONFIG_DVB_MT352=m
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_ATMEL_AT76C651=m
 CONFIG_DVB_VES1820=m
 CONFIG_DVB_TDA10021=m
 CONFIG_DVB_STV0297=m
-CONFIG_DVB_NXT2002=m
 CONFIG_DVB_OR51211=m
 CONFIG_DVB_OR51132=m
 CONFIG_VIDEO_SAA7146=m
@@ -1087,7 +1044,6 @@ CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_I2C=m
 CONFIG_FB_MATROX_MULTIHEAD=y
-CONFIG_FB_RADEON_OLD=m
 CONFIG_FB_RADEON=m
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
@@ -1190,21 +1146,11 @@ CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_USX2Y=m
 CONFIG_SOUND_PRIME=m
 CONFIG_SOUND_BT878=m
-CONFIG_SOUND_CMPCI=m
-# CONFIG_SOUND_CMPCI_FM is not set
-# CONFIG_SOUND_CMPCI_MIDI is not set
-CONFIG_SOUND_CMPCI_JOYSTICK=y
 CONFIG_SOUND_EMU10K1=m
 CONFIG_MIDI_EMU10K1=y
 CONFIG_SOUND_FUSION=m
-CONFIG_SOUND_CS4281=m
-CONFIG_SOUND_ES1370=m
 CONFIG_SOUND_ES1371=m
-CONFIG_SOUND_ESSSOLO1=m
-CONFIG_SOUND_MAESTRO=m
-CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ICH=m
-CONFIG_SOUND_SONICVIBES=m
 CONFIG_SOUND_TRIDENT=m
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
@@ -1215,32 +1161,21 @@ CONFIG_SOUND_OSS=m
 # CONFIG_SOUND_DMAP is not set
 CONFIG_SOUND_AD1816=m
 CONFIG_SOUND_AD1889=m
-CONFIG_SOUND_SGALAXY=m
 CONFIG_SOUND_ADLIB=m
 CONFIG_SOUND_ACI_MIXER=m
 CONFIG_SOUND_CS4232=m
 CONFIG_SOUND_SSCAPE=m
-CONFIG_SOUND_GUS=m
-CONFIG_SOUND_GUS16=y
-CONFIG_SOUND_GUSMAX=y
 CONFIG_SOUND_VMIDI=m
 CONFIG_SOUND_TRIX=m
 CONFIG_SOUND_MSS=m
 CONFIG_SOUND_MPU401=m
 CONFIG_SOUND_NM256=m
-CONFIG_SOUND_MAD16=m
-CONFIG_MAD16_OLDCARD=y
 CONFIG_SOUND_PAS=m
 CONFIG_SOUND_PSS=m
 CONFIG_PSS_MIXER=y
 CONFIG_SOUND_SB=m
-CONFIG_SOUND_WAVEFRONT=m
-CONFIG_SOUND_MAUI=m
 CONFIG_SOUND_YM3812=m
-CONFIG_SOUND_OPL3SA1=m
 CONFIG_SOUND_OPL3SA2=m
-CONFIG_SOUND_YMFPCI=m
-# CONFIG_SOUND_YMFPCI_LEGACY is not set
 CONFIG_SOUND_UART6850=m
 CONFIG_SOUND_AEDSP16=m
 CONFIG_SC6600=y
@@ -1252,10 +1187,6 @@ CONFIG_SC6600_CDROMBASE=0x0
 # CONFIG_AEDSP16_MPU401 is not set
 CONFIG_SOUND_TVMIXER=m
 CONFIG_SOUND_KAHLUA=m
-CONFIG_SOUND_ALI5455=m
-CONFIG_SOUND_FORTE=m
-CONFIG_SOUND_RME96XX=m
-CONFIG_SOUND_AD1980=m
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB=y
@@ -1273,7 +1204,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
-CONFIG_USB_AUDIO=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m
@@ -1297,8 +1227,6 @@ CONFIG_USB_AIPTEK=m
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
-CONFIG_USB_MTOUCH=m
-CONFIG_USB_EGALAX=m
 CONFIG_USB_XPAD=m
 CONFIG_USB_ATI_REMOTE=m
 CONFIG_USB_MDC800=m
@@ -1321,15 +1249,8 @@ CONFIG_USB_USBNET=m
 CONFIG_USB_ALI_M5632=y
 CONFIG_USB_AN2720=y
 CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-CONFIG_USB_KC2190=y
 CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-CONFIG_USB_AX8817X=y
 CONFIG_USB_ZD1201=m
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
@@ -1401,15 +1322,10 @@ CONFIG_INFINIBAND_IPOIB=m
 CONFIG_EDD=m
 CONFIG_JBD=m
 CONFIG_XFS_RT=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TMPFS_SECURITY=y
 # CONFIG_HUGETLBFS is not set
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
@@ -1421,8 +1337,6 @@ CONFIG_JFFS_FS_VERBOSE=0
 CONFIG_JFFS_PROC_FS=y
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_NAND is not set
-# CONFIG_JFFS2_FS_NOR_ECC is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
@@ -1488,7 +1402,6 @@ CONFIG_LOG_BUF_SHIFT=16
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_FS is not set
-# CONFIG_INIT_DEBUG is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_KPROBES is not set
 CONFIG_CRC_CCITT=m
@@ -1522,7 +1435,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_X86_PC=y
 # CONFIG_X86_VSMP is not set
-CONFIG_VM86=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_COMPUTONE=m
 CONFIG_MOXA_INTELLIO=m

debian/arch/amd64/config.amd64

@@ -4,13 +4,11 @@ CONFIG_STOP_MACHINE=y
 CONFIG_SMP=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_NUMA=y
-CONFIG_HAVE_DEC_LOCK=y
 CONFIG_NR_CPUS=32
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 CONFIG_R8169_VLAN=y
 CONFIG_FB_MATROX_G=y
 CONFIG_FB_MATROX_MAVEN=m
-# CONFIG_SOUND_AWE32_SYNTH is not set
 CONFIG_FS_MBCACHE=m
 CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_HAVE_MEMORY_PRESENT=y

debian/arch/config

@@ -16,15 +16,10 @@ CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
 CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
 CONFIG_KMOD=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
@@ -42,7 +37,6 @@ CONFIG_BLK_DEV_MD=m
 CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
@@ -63,7 +57,6 @@ CONFIG_EXT3_FS_POSIX_ACL=y
 # CONFIG_JBD_DEBUG is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=m
-CONFIG_XFS_EXPORT=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -129,8 +122,6 @@ CONFIG_SENSORS_PCA9539=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_SKGE=m
 CONFIG_USB_GADGET_SELECTED=y
-CONFIG_INFINIBAND_USER_VERBS=m
-CONFIG_USB_ITMTOUCH=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_SERIAL_8250_HUB6=m
@@ -367,8 +358,6 @@ CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_TUNNEL=m
-CONFIG_IP_TCPDIAG=m
-CONFIG_IP_TCPDIAG_IPV6=y
 CONFIG_TCP_CONG_ADVANCED=y
 
 #
@@ -440,12 +429,10 @@ CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
@@ -485,10 +472,8 @@ CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_LOG=m
@@ -533,7 +518,6 @@ CONFIG_IP_SCTP=m
 # CONFIG_SCTP_HMAC_NONE is not set
 
 # CONFIG_BLK_DEV_IDESCSI is not set
-CONFIG_W1_DS2433_CRC=y
 CONFIG_LXT_PHY=m
 CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_MEGARAID_SAS=m
@@ -542,9 +526,6 @@ CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_YEALINK=m
 CONFIG_FUSE_FS=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_PHYCONTROL=y
-# CONFIG_IPW_DEBUG is not set
-# CONFIG_EV64360 is not set
 CONFIG_FB_CYBLA=m
 CONFIG_VIDEO_SELECT=y
 CONFIG_CRC16=m
@@ -560,10 +541,8 @@ CONFIG_USB_NET_CDCETHER=m
 CONFIG_DVB_USB_VP702X=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_CHELSIO_T1=m
-CONFIG_W1_DS2433=m
 CONFIG_IP_NF_PPTP=m
 CONFIG_SCSI_SAS_ATTRS=m
-# CONFIG_WANT_EARLY_SERIAL is not set
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_DAVICOM_PHY=m
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
@@ -586,7 +565,6 @@ CONFIG_PHYLIB=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_MARVELL_PHY=m
 CONFIG_SCSI_SATA_MV=m
-CONFIG_SND_GENERIC_DRIVER=y
 CONFIG_SND_AC97_BUS=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_FLAT_NODE_MEM_MAP=y
@@ -600,7 +578,6 @@ CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_USB_NET_PLUSB=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_NETFILTER_NETLINK=m
-# CONFIG_IP_DCCP_UNLOAD_HACK is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_INET_DIAG=m
@@ -614,7 +591,6 @@ CONFIG_IPW2200=m
 CONFIG_IP_DCCP_CCID3=m
 CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SENSORS_W83792D=m
-CONFIG_RELAYFS_FS=m
 CONFIG_IP_NF_NETBIOS_NS=m
 CONFIG_NORTEL_HERMES=m
 CONFIG_USB_EMI26=m
@@ -626,7 +602,6 @@ CONFIG_IEEE80211=m
 CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_DELL_RBU=m
-CONFIG_FB_SOFT_CURSOR=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FUSION_MAX_SGE=40
@@ -649,49 +624,34 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_XFS_QUOTA=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-CONFIG_SCSI_QLA6312=m
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_INFINIBAND_SRP=m
-CONFIG_SCSI_QLA2322=m
-CONFIG_RTC_X1205_I2C=m
-CONFIG_SCSI_QLA21XX=m
 CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-CONFIG_USB_SERIAL_NOKIA_DKU2=m
 CONFIG_DEFAULT_AS=y
 # CONFIG_JFFS2_SUMMARY is not set
 CONFIG_SCSI_SATA_SIL24=m
-CONFIG_SCSI_QLA2300=m
 CONFIG_MTD_ONENAND=m
 CONFIG_PPP_MPPE=m
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_SCSI_PDC_ADMA=m
 CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
-# CONFIG_OBSOLETE_OSS_DRIVER is not set
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_VIDEO_EM28XX=m
 CONFIG_RFD_FTL=m
-CONFIG_SCSI_QLA22XX=m
 CONFIG_DVB_NXT200X=m
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_ISCSI_TCP=m
-CONFIG_SCSI_QLA24XX=m
-CONFIG_SCSI_QLA2XXX=m
 CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_TELCLOCK=m
 CONFIG_CARDMAN_4000=m
-CONFIG_USB_SERIAL_ANYDATA=m
-CONFIG_VIDEO_DECODER=m
-CONFIG_VIDEO_AUDIO_DECODER=m
 CONFIG_CARDMAN_4040=m
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_PACKET_MMAP=y
 CONFIG_MKISS=m
 CONFIG_VIDEO_BT848_DVB=y
-# CONFIG_USB_MIDI is not set
-CONFIG_OBSOLETE_OSS_USB_DRIVER=y
 CONFIG_ATM_DUMMY=m
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_VIDEO_SAA7134_OSS=m
@@ -705,7 +665,6 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_SPI_BITBANG=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_TIPC_ZONES=3
-CONFIG_IP_NF_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_ELF_CORE=y
@@ -758,7 +717,6 @@ CONFIG_YENTA_TI=y
 CONFIG_TIPC_LOG=0
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_OBSOLETE_INTERMODULE=m
 CONFIG_SCSI_QLA_FC=m
 CONFIG_DMI=y
 CONFIG_SPI_BUTTERFLY=m
@@ -766,11 +724,9 @@ CONFIG_TIPC_SLAVE_NODES=0
 # CONFIG_TIPC_DEBUG is not set
 # CONFIG_SLOB is not set
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
 CONFIG_TIPC_PORTS=8191
 CONFIG_SENSORS_VT8231=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_OCFS2_FS=m
 CONFIG_SPI_MASTER=y
@@ -779,14 +735,10 @@ CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_SLAB=y
 CONFIG_MTD_DATAFLASH=m
 # CONFIG_FORCED_INLINING is not set
-CONFIG_CLEAN_COMPILE=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_USB_ET61X251=m
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_CRYPTO_TWOFISH=m
-CONFIG_DEVPTS_FS_SECURITY=y
-CONFIG_DEVPTS_FS_XATTR=y
-CONFIG_MD_RAID6=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_FAULTY=m
 CONFIG_EXT2_FS_POSIX_ACL=y
@@ -814,7 +766,6 @@ CONFIG_MMC_SDHCI=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_VIDEO_SAA7127=m
 # CONFIG_RELAY is not set
-CONFIG_W1_MASTER_DS9490_BRIDGE=m
 # CONFIG_BCM43XX_DMA_MODE is not set
 CONFIG_RTC_LIB=m
 CONFIG_W1_SLAVE_DS2433=m
@@ -845,7 +796,6 @@ CONFIG_RTC_DRV_X1205=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_W1_MASTER_DS9490=m
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_RTC_DRV_DS1672=m
 CONFIG_INET_XFRM_TUNNEL=m
@@ -854,7 +804,6 @@ CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_LEDS_CLASS=m
 CONFIG_VIDEO_USBVIDEO=m
-# CONFIG_FB_FIRMWARE_EDID is not set
 # CONFIG_USB_GADGET_AT91 is not set
 CONFIG_RTC_CLASS=m
 CONFIG_RTC_DRV_PCF8563=m
@@ -876,7 +825,6 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_GIGASET_DEBUG is not set
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW_QOS=y
 CONFIG_VIDEO_CS53L32A=m
 # CONFIG_BCM43XX_PIO_MODE is not set
 CONFIG_W1_MASTER_DS2482=m

debian/patches/series/6-extra

@@ -1 +0,0 @@
-+ x86_64-smp-alternatives.patch amd64