From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Mon, 26 Nov 2007 19:36:59 +0000 (+0000)
Subject: pata_sc1200 is evül!
X-Git-Tag: linux-2.6-22-1~16
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=7d7fb3aa41fb516a6ee1e313a9ec7ddba21fd23f

pata_sc1200 is evül!
Disable automatic lback, reenable if deemed appropriate.
---

diff --git a/kernel-2.6.22-i586-planetlab.config b/kernel-2.6.22-i586-planetlab.config
index c110b86ac..2fd591e0f 100644
--- a/kernel-2.6.22-i586-planetlab.config
+++ b/kernel-2.6.22-i586-planetlab.config
@@ -950,7 +950,7 @@ CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_QDI=m
 CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SC1200=m
+# CONFIG_PATA_SC1200 is not set
 CONFIG_PATA_SERVERWORKS=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_SIL680=m
@@ -2061,7 +2061,7 @@ CONFIG_DOUBLEFAULT=y
 # Linux VServer
 #
 CONFIG_VSERVER_FILESHARING=y
-CONFIG_VSERVER_AUTO_LBACK=y
+# CONFIG_VSERVER_AUTO_LBACK is not set
 # CONFIG_VSERVER_AUTO_SINGLE is not set
 CONFIG_VSERVER_COWBL=y
 # CONFIG_VSERVER_VTIME is not set
diff --git a/kernel-2.6.22-i686-planetlab.config b/kernel-2.6.22-i686-planetlab.config
index 753d45c35..e47d077a2 100644
--- a/kernel-2.6.22-i686-planetlab.config
+++ b/kernel-2.6.22-i686-planetlab.config
@@ -956,7 +956,7 @@ CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_QDI=m
 CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SC1200=m
+# CONFIG_PATA_SC1200 is not set
 CONFIG_PATA_SERVERWORKS=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_SIL680=m
@@ -2068,7 +2068,7 @@ CONFIG_DOUBLEFAULT=y
 # Linux VServer
 #
 CONFIG_VSERVER_FILESHARING=y
-CONFIG_VSERVER_AUTO_LBACK=y
+# CONFIG_VSERVER_AUTO_LBACK is not set
 # CONFIG_VSERVER_AUTO_SINGLE is not set
 CONFIG_VSERVER_COWBL=y
 # CONFIG_VSERVER_VTIME is not set
diff --git a/kernel-2.6.22-x86_64-planetlab.config b/kernel-2.6.22-x86_64-planetlab.config
index bcadf7c47..8aef95482 100644
--- a/kernel-2.6.22-x86_64-planetlab.config
+++ b/kernel-2.6.22-x86_64-planetlab.config
@@ -861,7 +861,7 @@ CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SC1200=m
+# CONFIG_PATA_SC1200 is not set
 CONFIG_PATA_SERVERWORKS=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_SIL680=m
@@ -1902,7 +1902,7 @@ CONFIG_DEBUG_STACK_USAGE=y
 # Linux VServer
 #
 CONFIG_VSERVER_FILESHARING=y
-CONFIG_VSERVER_AUTO_LBACK=y
+# CONFIG_VSERVER_AUTO_LBACK is not set
 # CONFIG_VSERVER_AUTO_SINGLE is not set
 CONFIG_VSERVER_COWBL=y
 # CONFIG_VSERVER_VTIME is not set