Update 3.0.4 to use socketcan from mainline

diff --git a/kernel/3.0.4 b/kernel/3.0.4
index 842607de91cafb6e35b6e9f457dcbb1eeb1be0ca..1c8c373a3656529b51aad2e905bb156b7acfb55d 160000 (submodule)
--- 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 3079e847c94252ca190ef236262b676a0c96c34a..bcd8df85f292f7e91cfdd3d5330476d642aee141 100644 (file)
--- 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