Author: aniolek Date: Thu Jun 23 12:43:55 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - updated to 2.6.12.1
---- Files affected: SOURCES: kernel-i386.config (1.82.10.96 -> 1.82.10.97) ---- Diffs: ================================================================ Index: SOURCES/kernel-i386.config diff -u SOURCES/kernel-i386.config:1.82.10.96 SOURCES/kernel-i386.config:1.82.10.97 --- SOURCES/kernel-i386.config:1.82.10.96 Sun May 8 20:36:32 2005 +++ SOURCES/kernel-i386.config Thu Jun 23 14:43:50 2005 @@ -64,7 +64,7 @@ # CONFIG_X86_VISWS is not set # CONFIG_X86_GENERICARCH is not set # CONFIG_X86_ES7000 is not set -CONFIG_M386=y +# CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set @@ -72,7 +72,7 @@ # CONFIG_M686 is not set # CONFIG_MPENTIUMII is not set # CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set +CONFIG_MPENTIUMM=y # CONFIG_MPENTIUM4 is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set @@ -104,6 +104,7 @@ # CONFIG_X86_MCE_P4THERMAL is not set CONFIG_TOSHIBA=m CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y CONFIG_OMNIBOOK=m CONFIG_MICROCODE=m CONFIG_X86_MSR=m @@ -124,12 +125,14 @@ CONFIG_EFI=y CONFIG_BOOT_IOREMAP=y # CONFIG_REGPARM is not set +CONFIG_SECCOMP=y CONFIG_KEXEC=y # # Power management options (ACPI, APM) # CONFIG_PM=y +CONFIG_ACPI_SLEEP_PROC_SLEEP=y # CONFIG_PM_DEBUG is not set # CONFIG_SOFTWARE_SUSPEND is not set # CONFIG_PM_DISK is not set @@ -229,6 +232,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_CPU_FREQ_TABLE=m # @@ -275,6 +279,7 @@ CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY_PROC=y CONFIG_PCI_NAMES=y +CONFIG_PCI_DEBUG=y CONFIG_ISA=y # CONFIG_EISA is not set # CONFIG_MCA is not set @@ -737,6 +742,7 @@ CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m +CONFIG_SCSI_LPFC=m CONFIG_SCSI_SYM53C416=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m @@ -791,6 +797,8 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_EMC=m # # Fusion MPT device support @@ -859,6 +867,11 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_MULTIPATH_CACHED=y +CONFIG_IP_ROUTE_MULTIPATH_RR=m +CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m +CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m +CONFIG_IP_ROUTE_MULTIPATH_DRR=m CONFIG_IP_ROUTE_VERBOSE=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y @@ -989,6 +1002,7 @@ CONFIG_NET_QOS=y CONFIG_NET_ESTIMATOR=y CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE=y @@ -999,6 +1013,12 @@ CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m # CONFIG_NET_CLS_ACT is not set CONFIG_NET_CLS_POLICE=y @@ -1273,6 +1293,7 @@ CONFIG_SK98LIN_NAPI=y CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m +CONFIG_BNX2=m # # Ethernet (10000 Mbit) @@ -1541,6 +1562,7 @@ CONFIG_JOYSTICK_SPACEORB=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m CONFIG_JOYSTICK_TWIDDLER=m CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m @@ -1548,6 +1570,9 @@ CONFIG_JOYSTICK_JOYDUMP=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_MK712=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_UINPUT=m @@ -1597,12 +1622,20 @@ # # Non-8250 serial port support # +CONFIG_SERIAL_JSM=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y # +# TPM devices +# +CONFIG_TCG_TPM=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m + +# # Linux InfraRed Controller # CONFIG_LIRC_SUPPORT=m @@ -1825,7 +1858,9 @@ CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_FSCHER=m +CONFIG_SENSORS_FSCPOS=m CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -1836,9 +1871,11 @@ CONFIG_SENSORS_LM85=m CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SIS5595=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_W83781D=m @@ -1848,6 +1885,7 @@ # # Other I2C Chip support # +CONFIG_SENSORS_DS1337=m CONFIG_SENSORS_EEPROM=m CONFIG_SENSORS_PCF8574=m CONFIG_SENSORS_PCF8591=m @@ -1904,11 +1942,13 @@ CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_MEYE=m CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_OVCAMCHIP=m # @@ -1968,6 +2008,10 @@ # # Supported FlexCopII (B2C2) Adapters # +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y CONFIG_DVB_B2C2_SKYSTAR=m CONFIG_DVB_B2C2_USB=m @@ -2046,6 +2090,8 @@ CONFIG_VIDEO_SELECT=y CONFIG_FB_HGA=m # CONFIG_FB_HGA_ACCEL is not set +CONFIG_FB_NVIDIA=m +CONFIG_FB_NVIDIA_I2C=y CONFIG_FB_RIVA=m CONFIG_FB_RIVA_I2C=y # CONFIG_FB_RIVA_DEBUG is not set @@ -2071,8 +2117,8 @@ # CONFIG_FB_ATY_XL_INIT is not set CONFIG_FB_ATY_GX=y CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=m -CONFIG_FB_SAVAGE_ACCEL=m +CONFIG_FB_SAVAGE_I2C=y +CONFIG_FB_SAVAGE_ACCEL=y CONFIG_FB_SIS=m CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y @@ -2083,6 +2129,8 @@ CONFIG_FB_VOODOO1=m CONFIG_FB_TRIDENT=m CONFIG_FB_TRIDENT_ACCEL=y +# CONFIG_FB_GEODE is not set +CONFIG_FB_S1D13XXX=m CONFIG_FB_VIRTUAL=m # @@ -2206,6 +2254,7 @@ CONFIG_SND_RME96=m CONFIG_SND_RME9652=m CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m CONFIG_SND_TRIDENT=m CONFIG_SND_YMFPCI=m CONFIG_SND_ALS4000=m @@ -2225,6 +2274,7 @@ CONFIG_SND_VIA82XX=m CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VX222=m +CONFIG_SND_HDA_INTEL=m # # USB devices @@ -2339,6 +2389,7 @@ CONFIG_USB_OHCI_HCD=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m # # USB Device Class drivers @@ -2362,6 +2413,7 @@ CONFIG_USB_STORAGE_FREECOM=y CONFIG_USB_STORAGE_ISD200=y CONFIG_USB_STORAGE_DPCM=y +# CONFIG_USB_STORAGE_USBAT is not set CONFIG_USB_STORAGE_HP8200e=y CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y @@ -2411,6 +2463,7 @@ CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m CONFIG_USB_W9968CF=m +CONFIG_USB_PWC=m # # USB Network Adapters @@ -2444,6 +2497,8 @@ # USB Network Adapters # CONFIG_USB_AX8817X=y +CONFIG_USB_ZD1201=m +CONFIG_USB_MON=m # # USB port drivers @@ -2455,9 +2510,11 @@ # CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRPRIME=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m @@ -2486,11 +2543,13 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y CONFIG_USB_SERIAL_TI=m CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_EZUSB=y @@ -2508,6 +2567,7 @@ CONFIG_USB_PHIDGETKIT=m CONFIG_USB_PHIDGETSERVO=m CONFIG_USB_IDMOUSE=m +CONFIG_USB_SISUSBVGA=m CONFIG_USB_TEST=m # @@ -2779,6 +2839,7 @@ # # Kernel hacking # +CONFIG_PRINTK_TIME=y CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHEDSTATS is not set @@ -2816,6 +2877,7 @@ # CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_DEVELOP=y # CONFIG_SECURITY_SELINUX_AVC_STATS is not set +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # CONFIG_SECURITY_SELINUX_MLS is not set # @@ -2830,6 +2892,7 @@ CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.96&r2=1.82.10.97&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit