From 2d2fa318bbb5265ccc52d7602ec42a8487d276dd Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 29 Jun 2011 02:55:28 -0700
Subject: [PATCH] --- yaml --- r: 255979 b: refs/heads/master c:
 8d0f7cea7aa1bb63ddd0e94589d2c33bc99f0d9a h: refs/heads/master i:   255977:
 f08fa7ca20ba03746ba38bc197b75be00ad209e1   255975:
 4470f69ab424322c4dd36f603d057f0274f6dd41 v: v3

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

diff --git a/[refs] b/[refs]
index 3056c177ea89..7645d4cf5d8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 213ade8ca8c854435d99e4d2927655b2ae4191e9
+refs/heads/master: 8d0f7cea7aa1bb63ddd0e94589d2c33bc99f0d9a
diff --git a/trunk/drivers/net/can/sja1000/sja1000_of_platform.c b/trunk/drivers/net/can/sja1000/sja1000_of_platform.c
index 9793df6e3455..cee6ba2b8b58 100644
--- a/trunk/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/trunk/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -38,6 +38,7 @@
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/delay.h>
+#include <linux/io.h>
 #include <linux/can/dev.h>
 
 #include <linux/of_platform.h>