Author: hawk Date: Sat Jan 27 13:07:45 2007 GMT Module: SOURCES Tag: hawk-LINUX_2_6 ---- Log message: - merged from kernel-vanilla spec as a base
---- Files affected: SOURCES: kernel-alpha.config (1.30.6.3.2.169 -> 1.30.6.3.2.169.4.1) , kernel-alpha-smp.config (1.33.10.176 -> 1.33.10.176.4.1) , kernel-i386.config (1.82.10.163 -> 1.82.10.163.2.1) , kernel-i386-smp.config (1.59.10.154 -> 1.59.10.154.2.1) , kernel-netfilter.config (1.34.2.63 -> 1.34.2.63.4.1) , kernel-ppc.config (1.3.2.3.2.2.2.206 -> 1.3.2.3.2.2.2.206.4.1) , kernel-ppc-smp.config (1.6.4.1.2.206 -> 1.6.4.1.2.206.4.1) , kernel-sparc64.config (1.48.2.121 -> 1.48.2.121.4.1) , kernel-sparc64-smp.config (1.48.2.136 -> 1.48.2.136.4.1) , kernel-sparc.config (1.37.2.135 -> 1.37.2.135.4.1) , kernel-sparc-smp.config (1.9.2.6.2.103 -> 1.9.2.6.2.103.4.1) ---- Diffs: ================================================================ Index: SOURCES/kernel-alpha.config diff -u SOURCES/kernel-alpha.config:1.30.6.3.2.169 SOURCES/kernel-alpha.config:1.30.6.3.2.169.4.1 --- SOURCES/kernel-alpha.config:1.30.6.3.2.169 Sun Nov 26 10:11:10 2006 +++ SOURCES/kernel-alpha.config Sat Jan 27 14:07:40 2007 @@ -23,8 +23,7 @@ # # General setup # -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y @@ -38,6 +37,7 @@ CONFIG_RELAY=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +# CONFIG_TASK_XACCT is not set # CONFIG_EMBEDDED is not set CONFIG_SYSCTL=y CONFIG_KALLSYMS=y @@ -51,17 +51,14 @@ 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_SLAB=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set -CONFIG_OBSOLETE_INTERMODULE=m +# CONFIG_IPC_NS is not set +# CONFIG_UTS_NS is not set # # Loadable module support @@ -69,7 +66,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y @@ -146,14 +142,13 @@ # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_VERBOSE_MCHECK is not set -CONFIG_PCI_LEGACY_PROC=y # CONFIG_PCI_DEBUG is not set CONFIG_EISA_PCI_EISA=y CONFIG_EISA_VIRTUAL_ROOT=y CONFIG_EISA_NAMES=y # -# PCCARD (PCMCIA/CardBus) support +# PCCA # CONFIG_PCCARD=m # CONFIG_PCMCIA_DEBUG is not set @@ -198,6 +193,7 @@ CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=m +CONFIG_XFRM_SUB_POLICY=y CONFIG_NET_KEY=m CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -233,6 +229,7 @@ CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y @@ -250,6 +247,14 @@ CONFIG_TCP_CONG_SCALABLE=m CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_VENO=m +CONFIG_DEFAULT_BIC=y +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="bic" + # # IP: Virtual Server Configuration @@ -290,10 +295,16 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETLABEL is not set CONFIG_IPV6_TUNNEL=m CONFIG_NETWORK_SECMARK=y CONFIG_NETFILTER=y @@ -313,12 +324,13 @@ CONFIG_IP_DCCP_CCID2=m CONFIG_IP_DCCP_CCID3=m CONFIG_IP_DCCP_TFRC_LIB=m +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_SSFDC=m # # DCCP Kernel Hacking # # CONFIG_IP_DCCP_DEBUG is not set -# CONFIG_IP_DCCP_UNLOAD_HACK is not set # # SCTP Configuration (EXPERIMENTAL) @@ -387,7 +399,6 @@ CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_ESFQ=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_GRED=m @@ -625,7 +636,6 @@ # 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 @@ -657,7 +667,6 @@ CONFIG_MTD_MTDRAM=m CONFIG_MTDRAM_TOTAL_SIZE=4096 CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLKMTD=m CONFIG_MTD_BLOCK2MTD=m # @@ -818,6 +827,7 @@ CONFIG_BLK_DEV_HPT34X=m # CONFIG_HPT34X_AUTODMA is not set CONFIG_BLK_DEV_HPT366=m +CONFIG_BLK_DEV_JMICRON=m CONFIG_BLK_DEV_SC1200=m CONFIG_BLK_DEV_PIIX=m CONFIG_BLK_DEV_IT821X=m @@ -879,6 +889,8 @@ CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set # # SCSI low-level drivers @@ -886,9 +898,9 @@ CONFIG_ISCSI_TCP=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_7000FASST=m +# CONFIG_SCSI_7000FASST is not set CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AHA1542=m +# CONFIG_SCSI_AHA1542 is not set CONFIG_SCSI_AHA1740=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=m @@ -906,30 +918,18 @@ # CONFIG_AIC79XX_DEBUG_ENABLE is not set CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_IN2000=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_SATA=m -CONFIG_SCSI_SATA_AHCI=m -CONFIG_SCSI_SATA_SVW=m -CONFIG_SCSI_ATA_PIIX=m -CONFIG_SCSI_SATA_MV=m -CONFIG_SCSI_SATA_NV=m -CONFIG_SCSI_PDC_ADMA=m -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_SATA_QSTOR=m -CONFIG_SCSI_SATA_PROMISE=m -CONFIG_SCSI_SATA_SX4=m -CONFIG_SCSI_SATA_SIL=m -CONFIG_SCSI_SATA_SIL24=m -CONFIG_SCSI_SATA_SIS=m -CONFIG_SCSI_SATA_ULI=m -CONFIG_SCSI_SATA_VIA=m -CONFIG_SCSI_SATA_VITESSE=m -CONFIG_SCSI_SATA_INTEL_COMBINED=y CONFIG_SCSI_BUSLOGIC=m # CONFIG_SCSI_OMIT_FLASHPOINT is not set CONFIG_SCSI_DMX3191D=m @@ -955,7 +955,6 @@ 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_SYM53C8XX_MMIO=y CONFIG_SCSI_IPR=m # CONFIG_SCSI_IPR_TRACE is not set @@ -967,13 +966,6 @@ CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y CONFIG_SCSI_QLOGIC_1280=m CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y -CONFIG_SCSI_QLA21XX=m -CONFIG_SCSI_QLA22XX=m -CONFIG_SCSI_QLA2300=m -CONFIG_SCSI_QLA2322=m -CONFIG_SCSI_QLA6312=m -CONFIG_SCSI_QLA24XX=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_SIM710=m CONFIG_53C700_IO_MAPPED=y @@ -988,6 +980,63 @@ CONFIG_SCSI_DEBUG=m # +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +CONFIG_ATA=m +CONFIG_SATA_AHCI=m +# CONFIG_SATA_SVW is not set +CONFIG_ATA_PIIX=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SX4=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIL24=m +CONFIG_SATA_SIS=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_ATA_GENERIC=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +CONFIG_PATA_ISAPNP=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_LEGACY=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_QDI=m +CONFIG_PATA_RADISYS=m +CONFIG_PATA_RZ1000=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# # PCMCIA SCSI adapter support # CONFIG_PCMCIA_FDOMAIN=m @@ -1014,6 +1063,7 @@ # CONFIG_MD=y CONFIG_BLK_DEV_MD=m +# CONFIG_DM_DEBUG is not set CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m @@ -1093,12 +1143,6 @@ CONFIG_DUMMY=m CONFIG_BONDING=m CONFIG_EQUALIZER=m -CONFIG_IMQ=m -# CONFIG_IMQ_BEHAVIOR_AA is not set -CONFIG_IMQ_BEHAVIOR_AB=y -# CONFIG_IMQ_BEHAVIOR_BA is not set -# CONFIG_IMQ_BEHAVIOR_BB is not set -CONFIG_IMQ_NUM_DEVS=2 CONFIG_TUN=m CONFIG_NET_SB1000=m @@ -1141,19 +1185,19 @@ # CONFIG_NET_ETHERNET=y CONFIG_MII=m -CONFIG_HAPPYMEAL=m +# CONFIG_HAPPYMEAL is not set CONFIG_SUNGEM=m CONFIG_CASSINI=m -CONFIG_NET_VENDOR_3COM=y +# CONFIG_NET_VENDOR_3COM is not set CONFIG_EL1=m CONFIG_EL2=m CONFIG_ELPLUS=m CONFIG_EL16=m # CONFIG_EL3 is not set -CONFIG_3C515=m +# CONFIG_3C515 is not set CONFIG_VORTEX=m CONFIG_TYPHOON=m -CONFIG_LANCE=m +# CONFIG_LANCE is not set CONFIG_NET_VENDOR_SMC=y CONFIG_WD80x3=m CONFIG_ULTRA=m @@ -1161,14 +1205,14 @@ CONFIG_SMC9194=m CONFIG_NET_VENDOR_RACAL=y CONFIG_NI5010=m -CONFIG_NI52=m -CONFIG_NI65=m +# CONFIG_NI52 is not set +# CONFIG_NI65 is not set # # Tulip family network device support # CONFIG_NET_TULIP=y -CONFIG_DE2104X=m +# CONFIG_DE2104X is not set CONFIG_TULIP=m # CONFIG_TULIP_MWI is not set # CONFIG_TULIP_MMIO is not set @@ -1197,15 +1241,17 @@ # CONFIG_SEEQ8005 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=m +# CONFIG_PCNET32_NAPI is not set +# CONFIG_FORCEDETH_NAPI is not set CONFIG_AMD8111_ETH=m CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m # CONFIG_ADAPTEC_STARFIRE_NAPI is not set CONFIG_AC3200=m CONFIG_APRICOT=m -CONFIG_B44=m +# CONFIG_B44 is not set CONFIG_FORCEDETH=m -CONFIG_CS89x0=m +# CONFIG_CS89x0 is not set CONFIG_DGRS=m CONFIG_EEPRO100=m CONFIG_E100=m @@ -1221,7 +1267,7 @@ # CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set # CONFIG_8139_OLD_RX_RESET is not set -CONFIG_SIS900=m +# CONFIG_SIS900 is not set CONFIG_EPIC100=m CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set @@ -1251,10 +1297,10 @@ CONFIG_SKGE=m CONFIG_SKY2=m CONFIG_SK98LIN=m -CONFIG_SK98LIN_NAPI=y CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m CONFIG_BNX2=m +CONFIG_QLA3XXX=m # # Ethernet (10000 Mbit) @@ -1272,7 +1318,7 @@ CONFIG_TR=y CONFIG_IBMTR=m CONFIG_IBMOL=m -CONFIG_3C359=m +# CONFIG_3C359 is not set CONFIG_TMS380TR=m CONFIG_TMSPCI=m CONFIG_SKISA=m @@ -1371,7 +1417,6 @@ CONFIG_DSCC4_PCI_RST=y CONFIG_LANMEDIA=m CONFIG_SEALEVEL_4021=m -CONFIG_SYNCLINK_SYNCPPP=m CONFIG_HDLC=m CONFIG_HDLC_RAW=y CONFIG_HDLC_RAW_ETH=y @@ -1379,7 +1424,6 @@ CONFIG_HDLC_FR=y CONFIG_HDLC_PPP=y CONFIG_HDLC_X25=y -CONFIG_TAHOE9XX=m CONFIG_PCI200SYN=m CONFIG_WANXL=m CONFIG_PC300=m @@ -1400,15 +1444,14 @@ # # ATM drivers # -CONFIG_ATM_DD=m CONFIG_ATM_DUMMY=m CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m +# CONFIG_ATM_LANAI is not set CONFIG_ATM_ENI=m # CONFIG_ATM_ENI_DEBUG is not set # CONFIG_ATM_ENI_TUNE_BURST is not set CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM is not set # CONFIG_ATM_ZATM_DEBUG is not set CONFIG_ATM_IDT77252=m # CONFIG_ATM_IDT77252_DEBUG is not set @@ -1416,22 +1459,22 @@ CONFIG_ATM_IDT77252_USE_SUNI=y CONFIG_ATM_AMBASSADOR=m # CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON is not set # CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_FORE200E_MAYBE=m -CONFIG_ATM_FORE200E_PCA=y -CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y -CONFIG_ATM_FORE200E_USE_TASKLET=y -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_FORE200E=m +# CONFIG_ATM_FORE200E_MAYBE is not set +# CONFIG_ATM_FORE200E_PCA is not set +# CONFIG_ATM_FORE200E_PCA_DEFAULT_FW is not set +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +# CONFIG_ATM_FORE200E_TX_RETRY is not set +# CONFIG_ATM_FORE200E_DEBUG is not set +# CONFIG_ATM_FORE200E is not set CONFIG_ATM_HE=m CONFIG_ATM_HE_USE_SUNI=y CONFIG_FDDI=y CONFIG_DEFXX=m CONFIG_SKFP=m CONFIG_HIPPI=y -CONFIG_ROADRUNNER=m +# CONFIG_ROADRUNNER is not set # CONFIG_ROADRUNNER_LARGE_RINGS is not set CONFIG_PLIP=m CONFIG_PPP=m @@ -1515,6 +1558,7 @@ # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m # # Userland interfaces @@ -1539,6 +1583,7 @@ CONFIG_KEYBOARD_LKKBD=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m +CONFIG_KEYBOARD_STOWAWAY=m CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m CONFIG_MOUSE_SERIAL=m @@ -1578,6 +1623,9 @@ CONFIG_TOUCHSCREEN_ELO=m CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_UINPUT=m @@ -1611,7 +1659,7 @@ CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set CONFIG_DIGIEPCA=m -CONFIG_ESPSERIAL=m +# CONFIG_ESPSERIAL is not set CONFIG_MOXA_INTELLIO=m CONFIG_MOXA_SMARTIO=m CONFIG_ISI=m @@ -1626,8 +1674,8 @@ CONFIG_RIO=m # CONFIG_RIO_OLDPCI is not set CONFIG_STALDRV=y -CONFIG_STALLION=m -CONFIG_ISTALLION=m +# CONFIG_STALLION is not set +# CONFIG_ISTALLION is not set # # Serial drivers @@ -1671,7 +1719,7 @@ CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m +# CONFIG_IPMI_POWEROFF is not set # # Watchdog Cards @@ -1819,9 +1867,7 @@ CONFIG_SENSORS_PCF8574=m CONFIG_SENSORS_PCA9539=m CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_RTC8564=m CONFIG_SENSORS_MAX6875=m -CONFIG_RTC_X1205_I2C=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -1903,6 +1949,7 @@ CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83791D=m @@ -1915,6 +1962,9 @@ # # Misc devices # +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m # # Multimedia devices @@ -1932,6 +1982,7 @@ # Video Capture Adapters # # CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_VIVI=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y @@ -1959,7 +2010,6 @@ CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_OSS=m CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -1969,7 +2019,6 @@ CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y # # Encoders and Decoders @@ -1990,6 +2039,7 @@ # V4L USB devices # CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_29XXX=y <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-alpha.config?r1=1.30.6.3.2.169&r2=1.30.6.3.2.169.4.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-alpha-smp.config?r1=1.33.10.176&r2=1.33.10.176.4.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.163&r2=1.82.10.163.2.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.154&r2=1.59.10.154.2.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-netfilter.config?r1=1.34.2.63&r2=1.34.2.63.4.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-ppc.config?r1=1.3.2.3.2.2.2.206&r2=1.3.2.3.2.2.2.206.4.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-ppc-smp.config?r1=1.6.4.1.2.206&r2=1.6.4.1.2.206.4.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc64.config?r1=1.48.2.121&r2=1.48.2.121.4.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc64-smp.config?r1=1.48.2.136&r2=1.48.2.136.4.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc.config?r1=1.37.2.135&r2=1.37.2.135.4.1&f=u http://cvs.pld-linux.org/SOURCES/kernel-sparc-smp.config?r1=1.9.2.6.2.103&r2=1.9.2.6.2.103.4.1&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit