diff --git a/debian/changelog b/debian/changelog index f1d482a0c..b93343387 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,7 @@ linux-2.6 (2.6.26~rc8-1~experimental.1) UNRELEASED; urgency=low Geoff Levand . * 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 diff --git a/debian/config/config b/debian/config/config index ca5d858db..b6e5441bd 100644 --- a/debian/config/config +++ b/debian/config/config @@ -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