[kernel] r11787 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Fri Jul  4 18:02:54 2008
New Revision: 11787

Log:
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.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jul  4 18:02:54 2008
@@ -64,6 +64,7 @@
     Geoff Levand <geoffrey.levand at 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

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Jul  4 18:02:54 2008
@@ -93,7 +93,7 @@
 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_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