Update kernels to what is currently used

[can-benchmark.git] / kernel / build / shark / 2.6.33 / .config

diff --git a/kernel/build/shark/2.6.33/.config b/kernel/build/shark/2.6.33/.config
index 1d7acb4b2958f706faffb54d8d58f0806d2742cf..05148208d5af0df8a31c876a1b873466d789b2fc 100644 (file)
--- a/kernel/build/shark/2.6.33/.config
+++ b/kernel/build/shark/2.6.33/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.33.7
-# Wed Oct 27 10:14:31 2010
+# Mon Dec  6 18:41:52 2010
 #
 # CONFIG_PPC64 is not set
 
@@ -420,13 +420,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_CAN=y
 CONFIG_CAN_RAW=y
 # CONFIG_CAN_BCM is not set
-# CONFIG_CAN_GW is not set
+CONFIG_CAN_GW=y
 # CONFIG_CAN_ISOTP is not set
 
 #
 # CAN Device Drivers
 #
-# CONFIG_CAN_VCAN is not set
+CONFIG_CAN_VCAN=y
 # CONFIG_CAN_SLCAN is not set
 # CONFIG_CAN_OLD_DRIVERS is not set
 CONFIG_CAN_DEV=y
@@ -1212,7 +1212,7 @@ CONFIG_GENERIC_ATOMIC64=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y