From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 1 Dec 2010 11:56:17 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
X-Git-Tag: fix-allnoconfig~292
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/b178e8b371c622a0892eeb69876cc8297438ec26?hp=20d88915b9364612926d2ad764c9847e24e99ad7

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

diff --git a/kernel/build/shark/2.6.33-rt/.config b/kernel/build/shark/2.6.33-rt/.config
index 8ee556e..f30be9e 100644
--- a/kernel/build/shark/2.6.33-rt/.config
+++ b/kernel/build/shark/2.6.33-rt/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.33.7-rt29
-# Sun Nov 28 22:17:14 2010
+# Wed Dec  1 07:54:07 2010
 #
 # CONFIG_PPC64 is not set
 
@@ -429,7 +429,7 @@ CONFIG_CAN_GW=y
 #
 # 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