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

[Maximilian Attems]

Author: maks
Date: Sat Apr 19 15:46:20 2008
New Revision: 11104

Log:
topconfig: disable PATA_SIS

having 2 drivers enabled for the same pci ids is a bad idea.
as we don't switch over to pata yet, keep the old one enabled.

Lenny users will bug report *again* about changing root dev.
fun ;)
But it seems the nicer upgrade plan from Etch.


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	Sat Apr 19 15:46:20 2008
@@ -39,6 +39,7 @@
   * 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

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	Sat Apr 19 15:46:20 2008
@@ -128,7 +128,7 @@
 # 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