[powerpc,x86] Enable PATA_PCMCIA (Closes: #606324). Disable BLK_DEV_IDECS everywhere.

svn path=/dists/trunk/linux-2.6/; revision=16702
This commit is contained in:
Ben Hutchings 2010-12-12 03:54:31 +00:00
parent 5279c67eb0
commit 03e999dcf7
6 changed files with 13 additions and 5 deletions

2
debian/changelog vendored
View File

@ -3,6 +3,8 @@ linux-2.6 (2.6.37~rc5-1~experimental.4) UNRELEASED; urgency=low
[ Ben Hutchings ]
* debian/copyright: Add explanation of indirect linking of perf to
OpenSSL (Closes: #606520)
* [powerpc,x86] Enable PATA_PCMCIA (Closes: #606324)
* Disable BLK_DEV_IDECS
-- Ben Hutchings <ben@decadent.org.uk> Sat, 11 Dec 2010 21:21:10 +0000

View File

@ -290,7 +290,7 @@ CONFIG_SCx200_ACB=m
CONFIG_IDE=m
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_IDE_GD=m
CONFIG_BLK_DEV_IDECS=m
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_IDE_GENERIC=m

View File

@ -96,7 +96,7 @@ CONFIG_USB_MOUSE=m
CONFIG_IDE=m
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_IDE_GD=m
CONFIG_BLK_DEV_IDECS=m
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_IDE_GENERIC=m

View File

@ -249,7 +249,7 @@ CONFIG_SCx200_ACB=m
##
CONFIG_IDE=m
CONFIG_IDE_GD=m
CONFIG_BLK_DEV_IDECS=m
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_IDE_GENERIC=m

View File

@ -170,6 +170,7 @@ CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_RZ1000=m
CONFIG_PATA_SC1200=m
@ -505,7 +506,7 @@ CONFIG_SCx200_ACB=m
CONFIG_IDE=m
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_IDE_GD=m
CONFIG_BLK_DEV_IDECS=m
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
# CONFIG_BLK_DEV_IDEACPI is not set

View File

@ -78,6 +78,11 @@ CONFIG_PPC_PMAC=y
CONFIG_PREP_RESIDUAL=y
CONFIG_PROC_PREPRESIDUAL=y
##
## file: drivers/ata/config
##
CONFIG_PATA_PCMCIA=m
##
## file: drivers/atm/Kconfig
##
@ -271,7 +276,7 @@ CONFIG_IDE=y
# CONFIG_BLK_DEV_IDE_SATA is not set
CONFIG_IDE_GD=y
CONFIG_IDE_GD_ATA=y
CONFIG_BLK_DEV_IDECS=m
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
# CONFIG_IDE_GENERIC is not set