X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab-2.6.22-x86_64.config;h=b17c8f53a6b48d2f5fc447855d7e426c2bfe3894;hb=8321d03682685db4094d5132593e6d9515a6cca8;hp=9d5e3410555b6956e1c596f06d88d2b3469bb2ca;hpb=5f58a0acd1a6993d18ba39735da10864a1ec5c7c;p=linux-2.6.git

diff --git a/planetlab-2.6.22-x86_64.config b/planetlab-2.6.22-x86_64.config
index 9d5e34105..b17c8f53a 100644
--- a/planetlab-2.6.22-x86_64.config
+++ b/planetlab-2.6.22-x86_64.config
@@ -1313,7 +1313,7 @@ CONFIG_PC8736x_GPIO=m
 CONFIG_NSC_GPIO=m
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HPET is not set
-CONFIG_HANGCHECK_TIMER=m
+CONFIG_HANGCHECK_TIMER=y
 
 #
 # TPM devices
@@ -1528,7 +1528,44 @@ CONFIG_USB_STORAGE_KARMA=y
 #
 # USB Serial Converter support
 #
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP2101 is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_PL2303=m
 
 #
 # USB Miscellaneous drivers
@@ -1706,7 +1743,7 @@ CONFIG_QUOTACTL=y
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=m
 CONFIG_GENERIC_ACL=y
 
 #
@@ -1865,6 +1902,7 @@ CONFIG_NLS_UTF8=y
 # Instrumentation Support
 #
 CONFIG_PROFILING=y
+CONFIG_CHOPSTIX=y
 CONFIG_OPROFILE=m
 CONFIG_KPROBES=y
 
@@ -1906,6 +1944,11 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_DEBUG_STACK_USAGE=y
+CONFIG_KDB=y
+CONFIG_KDB_MODULES=m
+CONFIG_KDB_OFF=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_KDB_USB=y
 
 #
 # Linux VServer