Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark

diff --git a/kernel/build/shark/2.6.33/.config b/kernel/build/shark/2.6.33/.config
index 1d7acb4b2958f706faffb54d8d58f0806d2742cf..975b613e84e3a1e7a3fbe33f242f662445ea4da1 100644 (file)
--- a/kernel/build/shark/2.6.33/.config
+++ b/kernel/build/shark/2.6.33/.config
@@ -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