From: Marc Fiuczynski Date: Mon, 8 Jan 2007 14:13:02 +0000 (+0000) Subject: BUILTIN -> MODULE : CONFIG_IOSCHED_AS X-Git-Tag: before-vanilla-2_6_16_38-vs2_0_3_rc1-merge~13 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dc9e0813f7fa3d39fc9489ad0b9ecc888171ce25;p=linux-2.6.git BUILTIN -> MODULE : CONFIG_IOSCHED_AS BUILTIN -> MODULE : CONFIG_IOSCHED_DEADLINE DISABLE -> MODULE : CONFIG_EFI_VARS MODULE -> DISABLE : CONFIG_IP_SCTP BUILTIN -> MODULE : CONFIG_BLK_DEV_LOOP BUILTIN -> DISABLE : CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE MODULE -> DISABLE : CONFIG_EEPRO100 DISABLE -> BUILTIN : CONFIG_R8169_VLAN BUILTIN -> DISABLE : CONFIG_IPW_QOS DISABLE -> BUILTIN : CONFIG_INPUT_EVDEV BUILTIN -> DISABLE : CONFIG_INPUT_MISC DISABLE -> BUILTIN : CONFIG_HW_RANDOM DISABLE -> MODULE : CONFIG_I2C REMOVED -> DISABLE : CONFIG_I2C_CHARDEV REMOVED -> MODULE : CONFIG_I2C_ALGOBIT REMOVED -> DISABLE : CONFIG_I2C_ALGOPCF REMOVED -> DISABLE : CONFIG_I2C_ALGOPCA REMOVED -> DISABLE : CONFIG_I2C_ALI1535 REMOVED -> DISABLE : CONFIG_I2C_ALI1563 REMOVED -> DISABLE : CONFIG_I2C_ALI15X3 REMOVED -> DISABLE : CONFIG_I2C_AMD756 REMOVED -> DISABLE : CONFIG_I2C_AMD8111 REMOVED -> DISABLE : CONFIG_I2C_I801 REMOVED -> DISABLE : CONFIG_I2C_I810 REMOVED -> DISABLE : CONFIG_I2C_PIIX4 REMOVED -> DISABLE : CONFIG_I2C_NFORCE2 REMOVED -> DISABLE : CONFIG_I2C_PARPORT_LIGHT REMOVED -> DISABLE : CONFIG_I2C_PROSAVAGE REMOVED -> DISABLE : CONFIG_I2C_SAVAGE4 REMOVED -> DISABLE : CONFIG_SCx200_ACB REMOVED -> DISABLE : CONFIG_I2C_SIS5595 REMOVED -> DISABLE : CONFIG_I2C_SIS630 REMOVED -> DISABLE : CONFIG_I2C_SIS96X REMOVED -> DISABLE : CONFIG_I2C_STUB REMOVED -> DISABLE : CONFIG_I2C_VIA REMOVED -> DISABLE : CONFIG_I2C_VIAPRO REMOVED -> DISABLE : CONFIG_I2C_VOODOO3 REMOVED -> DISABLE : CONFIG_I2C_PCA_ISA REMOVED -> DISABLE : CONFIG_SENSORS_DS1337 REMOVED -> DISABLE : CONFIG_SENSORS_DS1374 REMOVED -> DISABLE : CONFIG_SENSORS_EEPROM REMOVED -> DISABLE : CONFIG_SENSORS_PCF8574 REMOVED -> DISABLE : CONFIG_SENSORS_PCA9539 REMOVED -> DISABLE : CONFIG_SENSORS_PCF8591 REMOVED -> DISABLE : CONFIG_SENSORS_MAX6875 REMOVED -> DISABLE : CONFIG_I2C_DEBUG_CORE REMOVED -> DISABLE : CONFIG_I2C_DEBUG_ALGO REMOVED -> DISABLE : CONFIG_I2C_DEBUG_BUS REMOVED -> DISABLE : CONFIG_I2C_DEBUG_CHIP DISABLE -> MODULE : CONFIG_VIDEO_DEV REMOVED -> DISABLE : CONFIG_VIDEO_V4L1 REMOVED -> DISABLE : CONFIG_VIDEO_V4L1_COMPAT REMOVED -> DISABLE : CONFIG_VIDEO_ADV_DEBUG REMOVED -> DISABLE : CONFIG_VIDEO_VIVI REMOVED -> DISABLE : CONFIG_VIDEO_BT848 REMOVED -> DISABLE : CONFIG_VIDEO_CPIA2 REMOVED -> DISABLE : CONFIG_VIDEO_SAA5249 REMOVED -> DISABLE : CONFIG_TUNER_3036 REMOVED -> DISABLE : CONFIG_VIDEO_SAA7134 REMOVED -> DISABLE : CONFIG_VIDEO_CX88 REMOVED -> DISABLE : CONFIG_VIDEO_MSP3400 REMOVED -> DISABLE : CONFIG_VIDEO_CS53L32A REMOVED -> DISABLE : CONFIG_VIDEO_WM8775 REMOVED -> DISABLE : CONFIG_VIDEO_WM8739 REMOVED -> DISABLE : CONFIG_VIDEO_CX25840 REMOVED -> DISABLE : CONFIG_VIDEO_SAA711X REMOVED -> DISABLE : CONFIG_VIDEO_SAA7127 REMOVED -> DISABLE : CONFIG_VIDEO_UPD64031A REMOVED -> DISABLE : CONFIG_VIDEO_UPD64083 64 -> 16 : CONFIG_VGACON_SOFT_SCROLLBACK_SIZE DISABLE -> MODULE : CONFIG_USB_NET_GL620A DISABLE -> MODULE : CONFIG_USB_NET_NET1080 DISABLE -> MODULE : CONFIG_USB_NET_PLUSB DISABLE -> MODULE : CONFIG_USB_NET_CDC_SUBSET REMOVED -> BUILTIN : CONFIG_USB_ALI_M5632 REMOVED -> BUILTIN : CONFIG_USB_AN2720 REMOVED -> BUILTIN : CONFIG_USB_BELKIN REMOVED -> BUILTIN : CONFIG_USB_ARMLINUX REMOVED -> BUILTIN : CONFIG_USB_EPSON2888 DISABLE -> MODULE : CONFIG_USB_NET_ZAURUS DISABLE -> BUILTIN : CONFIG_EXT2_FS_XIP REMOVED -> BUILTIN : CONFIG_FS_XIP DISABLE -> BUILTIN : CONFIG_INOTIFY DISABLE -> BUILTIN : CONFIG_CRAMFS BUILTIN -> DISABLE : CONFIG_CRYPTO_HMAC DISABLE -> MODULE : CONFIG_CRYPTO_CRC32C DISABLE -> MODULE : CONFIG_CRC16 DISABLE -> MODULE : CONFIG_LIBCRC32C DISABLE -> REMOVED : CONFIG_SCTP_DBG_MSG DISABLE -> REMOVED : CONFIG_SCTP_DBG_OBJCNT DISABLE -> REMOVED : CONFIG_SCTP_HMAC_NONE DISABLE -> REMOVED : CONFIG_SCTP_HMAC_SHA1 BUILTIN -> REMOVED : CONFIG_SCTP_HMAC_MD5 MODULE -> REMOVED : CONFIG_SCSI_QLA21XX MODULE -> REMOVED : CONFIG_SCSI_QLA22XX MODULE -> REMOVED : CONFIG_SCSI_QLA2300 MODULE -> REMOVED : CONFIG_SCSI_QLA2322 MODULE -> REMOVED : CONFIG_SCSI_QLA24XX DISABLE -> REMOVED : CONFIG_INPUT_PCSPKR DISABLE -> REMOVED : CONFIG_INPUT_WISTRON_BTNS DISABLE -> REMOVED : CONFIG_INPUT_UINPUT --- diff --git a/configs/kernel-2.6.17-i686-planetlab.config b/configs/kernel-2.6.17-i686-planetlab.config index 2acdd7a0d..5be07aac6 100644 --- a/configs/kernel-2.6.17-i686-planetlab.config +++ b/configs/kernel-2.6.17-i686-planetlab.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-1.2142_FC4.3 -# Wed Oct 18 22:35:27 2006 +# Linux kernel version: 2.6.17-1.2187_FC5.0smp +# Mon Jan 8 13:48:19 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -79,8 +79,8 @@ CONFIG_LSF=y # IO Schedulers # CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_AS=m +CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set @@ -163,7 +163,7 @@ CONFIG_X86_MCE_P4THERMAL=y # Firmware Drivers # # CONFIG_EDD is not set -# CONFIG_EFI_VARS is not set +CONFIG_EFI_VARS=m # CONFIG_DELL_RBU is not set # CONFIG_DCDBAS is not set # CONFIG_NOHIGHMEM is not set @@ -433,12 +433,7 @@ CONFIG_VNET=m # # SCTP Configuration (EXPERIMENTAL) # -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y +# CONFIG_IP_SCTP is not set # # TIPC Configuration (EXPERIMENTAL) @@ -558,7 +553,7 @@ CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_UMEM=m # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_VROOT is not set CONFIG_BLK_DEV_NBD=m @@ -735,12 +730,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set 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_QLA24XX=m +# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m @@ -850,7 +840,7 @@ CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m CONFIG_FORCEDETH=m CONFIG_DGRS=m -CONFIG_EEPRO100=m +# CONFIG_EEPRO100 is not set CONFIG_E100=m CONFIG_FEALNX=m CONFIG_NATSEMI=m @@ -883,7 +873,7 @@ CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m CONFIG_R8169=m CONFIG_R8169_NAPI=y -# CONFIG_R8169_VLAN is not set +CONFIG_R8169_VLAN=y CONFIG_SIS190=m CONFIG_SKGE=m CONFIG_SKY2=m @@ -926,7 +916,7 @@ CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y -CONFIG_IPW_QOS=y +# CONFIG_IPW_QOS is not set # CONFIG_IPW2200_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m @@ -993,7 +983,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -1011,10 +1001,7 @@ CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set -CONFIG_INPUT_MISC=y -# CONFIG_INPUT_PCSPKR is not set -# CONFIG_INPUT_WISTRON_BTNS is not set -# CONFIG_INPUT_UINPUT is not set +# CONFIG_INPUT_MISC is not set # # Hardware I/O ports @@ -1069,7 +1056,7 @@ CONFIG_UNIX98_PTYS=y # Watchdog Cards # # CONFIG_WATCHDOG is not set -# CONFIG_HW_RANDOM is not set +CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set # CONFIG_RTC is not set # CONFIG_GEN_RTC is not set @@ -1099,7 +1086,55 @@ CONFIG_HANGCHECK_TIMER=y # # I2C support # -# CONFIG_I2C is not set +CONFIG_I2C=m +# CONFIG_I2C_CHARDEV is not set + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +# CONFIG_SCx200_ACB is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_VOODOO3 is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# 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 # # SPI support @@ -1126,9 +1161,48 @@ CONFIG_HANGCHECK_TIMER=y # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=m +# CONFIG_VIDEO_V4L1 is not set +# CONFIG_VIDEO_V4L1_COMPAT is not set CONFIG_VIDEO_V4L2=y +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_BT848 is not set +# CONFIG_VIDEO_CPIA2 is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_SAA7134 is not set +# CONFIG_VIDEO_CX88 is not set + +# +# Encoders and Decoders +# +# CONFIG_VIDEO_MSP3400 is not set +# CONFIG_VIDEO_CS53L32A is not set +# CONFIG_VIDEO_WM8775 is not set +# CONFIG_VIDEO_WM8739 is not set +# CONFIG_VIDEO_CX25840 is not set +# CONFIG_VIDEO_SAA711X is not set +# CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_UPD64031A is not set +# CONFIG_VIDEO_UPD64083 is not set + +# +# V4L USB devices +# + +# +# Radio Adapters +# + # # Digital Video Broadcasting Devices # @@ -1146,7 +1220,7 @@ CONFIG_VIDEO_SELECT=y # CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=16 CONFIG_DUMMY_CONSOLE=y # @@ -1248,12 +1322,17 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_GL620A is not set -# CONFIG_USB_NET_NET1080 is not set -# CONFIG_USB_NET_PLUSB is not set +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_RNDIS_HOST=m -# CONFIG_USB_NET_CDC_SUBSET is not set -# CONFIG_USB_NET_ZAURUS is not set +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_NET_ZAURUS=m CONFIG_USB_ZD1201=m # CONFIG_USB_MON is not set @@ -1337,7 +1416,8 @@ CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT2_FS_XIP=y +CONFIG_FS_XIP=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y @@ -1352,7 +1432,7 @@ CONFIG_FS_POSIX_ACL=y # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set -# CONFIG_INOTIFY is not set +CONFIG_INOTIFY=y CONFIG_QUOTA=y # CONFIG_QFMT_V1 is not set CONFIG_QFMT_V2=y @@ -1405,7 +1485,7 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_CRAMFS is not set +CONFIG_CRAMFS=y # CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -1567,7 +1647,7 @@ CONFIG_VSERVER_LEGACYNET=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=y @@ -1590,7 +1670,7 @@ CONFIG_CRYPTO_ARC4=m # CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_DEFLATE is not set CONFIG_CRYPTO_MICHAEL_MIC=m -# CONFIG_CRYPTO_CRC32C is not set +CONFIG_CRYPTO_CRC32C=m # CONFIG_CRYPTO_TEST is not set # CONFIG_CRYPTO_SIGNATURE is not set # CONFIG_CRYPTO_MPILIB is not set @@ -1604,9 +1684,9 @@ CONFIG_CRYPTO_MICHAEL_MIC=m # Library routines # CONFIG_CRC_CCITT=m -# CONFIG_CRC16 is not set +CONFIG_CRC16=m CONFIG_CRC32=y -# CONFIG_LIBCRC32C is not set +CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m