From: Michal Sojka <sojka@os.inf.tu-dresden.de>
Date: Fri, 23 Sep 2011 06:59:20 +0000 (+0200)
Subject: Update 3.0.4 to use socketcan from mainline
X-Git-Tag: fix-allnoconfig~178
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/dc850b60a6ef0ba06bd35e2b533b25a7c4bd7be6

Update 3.0.4 to use socketcan from mainline
---

diff --git a/kernel/3.0.4 b/kernel/3.0.4
index 842607d..1c8c373 160000
--- a/kernel/3.0.4
+++ b/kernel/3.0.4
@@ -1 +1 @@
-Subproject commit 842607de91cafb6e35b6e9f457dcbb1eeb1be0ca
+Subproject commit 1c8c373a3656529b51aad2e905bb156b7acfb55d
diff --git a/kernel/build/shark/3.0.4/.config b/kernel/build/shark/3.0.4/.config
index 3079e84..bcd8df8 100644
--- a/kernel/build/shark/3.0.4/.config
+++ b/kernel/build/shark/3.0.4/.config
@@ -434,29 +434,25 @@ CONFIG_CAN=y
 CONFIG_CAN_RAW=y
 # CONFIG_CAN_BCM is not set
 CONFIG_CAN_GW=y
-# CONFIG_CAN_ISOTP is not set
 
 #
 # CAN Device Drivers
 #
 CONFIG_CAN_VCAN=y
 # CONFIG_CAN_SLCAN is not set
-# CONFIG_CAN_OLD_DRIVERS is not set
 CONFIG_CAN_DEV=y
-# CONFIG_CAN_DEV_SYSFS is not set
 CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_SOFTING is not set
-# CONFIG_CAN_CC770 is not set
 CONFIG_CAN_MSCAN=y
 CONFIG_CAN_MPC5XXX=y
-# CONFIG_CAN_MPC52XX is not set
 # CONFIG_CAN_SJA1000 is not set
+# CONFIG_CAN_C_CAN is not set
 
 #
 # CAN USB interfaces
 #
 # CONFIG_CAN_EMS_USB is not set
 # CONFIG_CAN_ESD_USB2 is not set
+# CONFIG_CAN_SOFTING is not set
 # CONFIG_CAN_DEBUG_DEVICES is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set