From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 1 Dec 2010 15:00:02 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
X-Git-Tag: fix-allnoconfig~278^2
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/46501dba4480f0dbb96b994246442c11fdd6e58e?hp=29234aa6f86d4013f3abff57afaf9058272f7f09

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 1d7acb4..975b613 100644
--- 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