diff --git a/debian/changelog b/debian/changelog index 54101c064..dba2bd824 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ linux-2.6 (2.6.25-1~experimental.1) UNRELEASED; urgency=low * input: Add 4 additional exports for modular speakup and braille support. * firewire: Add firewire-git.patch for latest firewire tree features. * 686: Set USB_PERSIST for eee pc suspend support. (closes: #468213) + * topconfig disable PATA_SIS as sis5513 enabled. (closes: #475525) [ Martin Michlmayr ] * [arm/armel] Add a kernel for Orion based devices, such as the QNAP diff --git a/debian/config/config b/debian/config/config index e419c79b7..5c7090384 100644 --- a/debian/config/config +++ b/debian/config/config @@ -128,7 +128,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=m +# CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set # CONFIG_PATA_WINBOND_VLB is not set