There is a platform PATA driver for SWARM IDE these days, so disable

IDE and build in ATA, SCSI and BLK_DEV_SD.

svn path=/dists/trunk/linux-2.6/; revision=13610
This commit is contained in:
Martin Michlmayr 2009-05-11 21:33:45 +00:00
parent 00a370458e
commit f9303059a2
3 changed files with 11 additions and 68 deletions

3
debian/changelog vendored
View File

@ -36,6 +36,9 @@ linux-2.6 (2.6.30~rc5-1~experimental.1) UNRELEASED; urgency=low
BLK_DEV_IO_TRACE, CONTEXT_SWITCH_TRACER, ARM_UNWIND and
SECURITY_SELINUX because of size constraints.
* [armel/kirkwood] Add CPU idle driver (Rabeeh Khoury)
* [mips/sb1-bcm91250a, mipsel/sb1-bcm91250a] There is a platform PATA
driver for SWARM IDE these days, so disable IDE and build in ATA,
SCSI and BLK_DEV_SD.
-- maximilian attems <maks@debian.org> Mon, 30 Mar 2009 14:40:26 +0200

View File

@ -126,7 +126,7 @@ CONFIG_SIBYTE_CFE=y
##
## file: drivers/ata/Kconfig
##
CONFIG_ATA=m
CONFIG_ATA=y
CONFIG_SATA_AHCI=m
CONFIG_SATA_SIL24=m
CONFIG_SATA_SVW=m
@ -287,37 +287,7 @@ CONFIG_I2C_STUB=m
##
## file: drivers/ide/Kconfig
##
CONFIG_IDE=y
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_IDE_GD=y
CONFIG_IDE_GD_ATA=y
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_IDE_GENERIC=y
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
CONFIG_BLK_DEV_AEC62XX=m
CONFIG_BLK_DEV_ALI15X3=m
CONFIG_BLK_DEV_AMD74XX=m
CONFIG_BLK_DEV_CMD64X=m
CONFIG_BLK_DEV_TRIFLEX=m
CONFIG_BLK_DEV_CY82C693=m
# CONFIG_BLK_DEV_CS5520 is not set
CONFIG_BLK_DEV_CS5530=m
CONFIG_BLK_DEV_HPT366=m
CONFIG_BLK_DEV_SC1200=m
CONFIG_BLK_DEV_PIIX=m
CONFIG_BLK_DEV_IT821X=m
CONFIG_BLK_DEV_NS87415=m
CONFIG_BLK_DEV_PDC202XX_OLD=m
CONFIG_BLK_DEV_PDC202XX_NEW=m
CONFIG_BLK_DEV_SVWKS=m
CONFIG_BLK_DEV_SIIMAGE=m
CONFIG_BLK_DEV_SLC90E66=m
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_IDE_ARM is not set
# CONFIG_IDE is not set
##
## file: drivers/infiniband/Kconfig
@ -600,8 +570,8 @@ CONFIG_VIA_RHINE=m
## file: drivers/scsi/Kconfig
##
CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_BLK_DEV_SD=m
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=m

View File

@ -126,7 +126,7 @@ CONFIG_SIBYTE_CFE=y
##
## file: drivers/ata/Kconfig
##
CONFIG_ATA=m
CONFIG_ATA=y
CONFIG_SATA_AHCI=m
CONFIG_SATA_SIL24=m
CONFIG_SATA_SVW=m
@ -287,37 +287,7 @@ CONFIG_I2C_STUB=m
##
## file: drivers/ide/Kconfig
##
CONFIG_IDE=y
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_IDE_GD=y
CONFIG_IDE_GD_ATA=y
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_IDE_GENERIC=y
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_BLK_DEV_OPTI621 is not set
CONFIG_BLK_DEV_AEC62XX=m
CONFIG_BLK_DEV_ALI15X3=m
CONFIG_BLK_DEV_AMD74XX=m
CONFIG_BLK_DEV_CMD64X=m
CONFIG_BLK_DEV_TRIFLEX=m
CONFIG_BLK_DEV_CY82C693=m
# CONFIG_BLK_DEV_CS5520 is not set
CONFIG_BLK_DEV_CS5530=m
CONFIG_BLK_DEV_HPT366=m
CONFIG_BLK_DEV_SC1200=m
CONFIG_BLK_DEV_PIIX=m
CONFIG_BLK_DEV_IT821X=m
CONFIG_BLK_DEV_NS87415=m
CONFIG_BLK_DEV_PDC202XX_OLD=m
CONFIG_BLK_DEV_PDC202XX_NEW=m
CONFIG_BLK_DEV_SVWKS=m
CONFIG_BLK_DEV_SIIMAGE=m
CONFIG_BLK_DEV_SLC90E66=m
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_IDE_ARM is not set
# CONFIG_IDE is not set
##
## file: drivers/infiniband/Kconfig
@ -600,8 +570,8 @@ CONFIG_VIA_RHINE=m
## file: drivers/scsi/Kconfig
##
CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_BLK_DEV_SD=m
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=m