From 6464d1a2af53c71ff813054780e5d3e95694c84b Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 9 Feb 2011 12:43:38 -0800
Subject: [PATCH] --- yaml --- r: 233093 b: refs/heads/master c:
 69e6ed186009ce86cbf5da95f45227064134d694 h: refs/heads/master i:   233091:
 ded8d20f22106d34577ba963e6d260c787c3c444 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/can/softing/softing_cs.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9f7423070b86..b30d02f262d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae0935776c3c7f4c99d0b3909755fe0896277d0e
+refs/heads/master: 69e6ed186009ce86cbf5da95f45227064134d694
diff --git a/trunk/drivers/net/can/softing/softing_cs.c b/trunk/drivers/net/can/softing/softing_cs.c
index 300fe75dd1a7..c11bb4de8630 100644
--- a/trunk/drivers/net/can/softing/softing_cs.c
+++ b/trunk/drivers/net/can/softing/softing_cs.c
@@ -19,6 +19,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>