Update 3.0.4-rt to use socketcan from mainline

diff --git a/kernel/3.0.4-rt14 b/kernel/3.0.4-rt14
index b6b48cd1cba6927178ebf09974bce3e8bd7efe2f..b2052fdfca09ca37e55f9f73ef77952eff42ac0c 160000 (submodule)
--- a/kernel/3.0.4-rt14
+++ b/kernel/3.0.4-rt14
@@ -1 +1 @@
-Subproject commit b6b48cd1cba6927178ebf09974bce3e8bd7efe2f
+Subproject commit b2052fdfca09ca37e55f9f73ef77952eff42ac0c

diff --git a/kernel/build/shark/3.0.4-rt14/.config b/kernel/build/shark/3.0.4-rt14/.config
index ee5f4675f0377adc5c28c7a46dddce97b9d9b917..2a7d951dfbb851d8ed9d2ced3037c9f1e8bdc6ad 100644 (file)
--- a/kernel/build/shark/3.0.4-rt14/.config
+++ b/kernel/build/shark/3.0.4-rt14/.config
@@ -433,29 +433,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