topconfig enable PATA_SIS instead of SATA_SIS

* pata_sis supports more chipsets
* SATA_SIS enables PATA_SIS anyway
* don't leave the choice to d-i that only chips sata_sis

needs a release notes pickup for changing rootdev.

svn path=/dists/trunk/linux-2.6/; revision=11787
This commit is contained in:
Maximilian Attems 2008-07-04 18:02:54 +00:00
parent 70123a329f
commit 712e43f8e8
2 changed files with 3 additions and 2 deletions

1
debian/changelog vendored
View File

@ -64,6 +64,7 @@ linux-2.6 (2.6.26~rc8-1~experimental.1) UNRELEASED; urgency=low
Geoff Levand <geoffrey.levand@am.sony.com>.
* Enable BLK_DEV_BSG for SG v4 support.
* [amd64] Enable default disabled memtest boot param.
* topconfig: Enable PATA_SIS instead of SATA_SIS. (closes: #485609)
[ Martin Michlmayr ]
* [arm/orion5x] Update the config to reflect upstream renaming this

View File

@ -93,7 +93,7 @@ CONFIG_SATA_QSTOR=m
CONFIG_SATA_PROMISE=m
CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
# CONFIG_SATA_SIS is not set
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
@ -138,7 +138,7 @@ CONFIG_PATA_MARVELL=m
# CONFIG_PATA_SERVERWORKS is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
CONFIG_PATA_SIS=m
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
# CONFIG_PATA_WINBOND_VLB is not set