git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3cb2454)
back out 10471 for x86_64 as well
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 12 Sep 2008 10:01:01 +0000 (10:01 +0000)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 12 Sep 2008 10:01:01 +0000 (10:01 +0000)
planetlab-2.6.22-x86_64.config patch | blob | history

diff --git a/planetlab-2.6.22-x86_64.config b/planetlab-2.6.22-x86_64.config
index 9547179..47ec384 100644 (file)
--- a/planetlab-2.6.22-x86_64.config
+++ b/planetlab-2.6.22-x86_64.config
@@ -1528,8 +1528,7 @@ CONFIG_USB_STORAGE_KARMA=y
 #
 # USB Serial Converter support
 #
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL is not set
 
 #
 # USB Miscellaneous drivers
@@ -1867,7 +1866,6 @@ CONFIG_NLS_UTF8=y
 #
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
-CONFIG_CHOPSTIX=y
 CONFIG_KPROBES=y
 
 #
linux-2.6