* Revert r6921 because now I do want a kernel without builtin IDE

support and so on (so that I can test kernel modules in initrd).

svn path=/nixpkgs/trunk/; revision=6931
This commit is contained in:
Eelco Dolstra 2006-11-02 23:40:16 +00:00
parent 05c884b471
commit e23c7013be

View file

@ -1088,34 +1088,34 @@ CONFIG_ATA_OVER_ETH=m
# #
# ATA/ATAPI/MFM/RLL support # ATA/ATAPI/MFM/RLL support
# #
CONFIG_IDE=y CONFIG_IDE=m
CONFIG_BLK_DEV_IDE=y CONFIG_BLK_DEV_IDE=m
# #
# Please see Documentation/ide.txt for help/info on IDE drives # Please see Documentation/ide.txt for help/info on IDE drives
# #
# CONFIG_BLK_DEV_IDE_SATA is not set # CONFIG_BLK_DEV_IDE_SATA is not set
# CONFIG_BLK_DEV_HD_IDE is not set # CONFIG_BLK_DEV_HD_IDE is not set
CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDEDISK=m
CONFIG_IDEDISK_MULTI_MODE=y CONFIG_IDEDISK_MULTI_MODE=y
CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_IDECS=m
CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEFLOPPY=y CONFIG_BLK_DEV_IDEFLOPPY=m
CONFIG_BLK_DEV_IDESCSI=m CONFIG_BLK_DEV_IDESCSI=m
# CONFIG_IDE_TASK_IOCTL is not set # CONFIG_IDE_TASK_IOCTL is not set
# #
# IDE chipset support/bugfixes # IDE chipset support/bugfixes
# #
CONFIG_IDE_GENERIC=y CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y CONFIG_BLK_DEV_CMD640=y
CONFIG_BLK_DEV_CMD640_ENHANCED=y CONFIG_BLK_DEV_CMD640_ENHANCED=y
CONFIG_BLK_DEV_IDEPNP=y CONFIG_BLK_DEV_IDEPNP=y
CONFIG_BLK_DEV_IDEPCI=y CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y CONFIG_IDEPCI_SHARE_IRQ=y
CONFIG_BLK_DEV_OFFBOARD=y CONFIG_BLK_DEV_OFFBOARD=y
CONFIG_BLK_DEV_GENERIC=y CONFIG_BLK_DEV_GENERIC=m
CONFIG_BLK_DEV_OPTI621=m CONFIG_BLK_DEV_OPTI621=m
CONFIG_BLK_DEV_RZ1000=m CONFIG_BLK_DEV_RZ1000=m
CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_IDEDMA_PCI=y
@ -3197,7 +3197,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT2_FS_XIP=y CONFIG_EXT2_FS_XIP=y
CONFIG_FS_XIP=y CONFIG_FS_XIP=y
CONFIG_EXT3_FS=y CONFIG_EXT3_FS=m
CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT3_FS_SECURITY=y
@ -3243,7 +3243,7 @@ CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y CONFIG_JOLIET=y
CONFIG_ZISOFS=y CONFIG_ZISOFS=y
CONFIG_ZISOFS_FS=y CONFIG_ZISOFS_FS=y
CONFIG_UDF_FS=y CONFIG_UDF_FS=m
CONFIG_UDF_NLS=y CONFIG_UDF_NLS=y
# #