Remove everything from version.h except definition of RCSID().

[socketcan-devel.git] / kernel / 2.6 / net / can / af_can.c

diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c
index 799fb760abbf63df4536dae692aec9f9a4360654..8de4c9f71e32bd40f8fc101c589898f1f3607913 100644 (file)
--- a/kernel/2.6/net/can/af_can.c
+++ b/kernel/2.6/net/can/af_can.c
@@ -71,8 +71,8 @@
 RCSID("$Id$");
 
 #define IDENT "af_can"
-static __initdata const char banner[] = KERN_INFO "CAN: Controller Area "
-                                       "Network PF_CAN core " VERSION "\n"; 
+static __initdata const char banner[] =
+       KERN_INFO "CAN: Controller Area Network PF_CAN core " CAN_VERSION "\n";
 
 MODULE_DESCRIPTION("Controller Area Network PF_CAN core");
 MODULE_LICENSE("Dual BSD/GPL");
@@ -162,6 +162,15 @@ static struct can_proto *proto_tab[CAN_NPROTO];
 extern struct timer_list stattimer; /* timer for statistics update */
 extern struct s_stats  stats;       /* packet statistics */
 extern struct s_pstats pstats;      /* receive list statistics */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+static void *kzalloc(size_t size, unsigned int __nocast flags)
+{
+       void *ret = kmalloc(size, flags);
+       if (ret)
+               memset(ret, 0, size);
+       return ret;
+}
+#endif
 
 module_init(can_init);
 module_exit(can_exit);