git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[pandora-kernel.git]
/
drivers
/
net
/
can
/
sja1000
/
sja1000_of_platform.c
diff --git
a/drivers/net/can/sja1000/sja1000_of_platform.c
b/drivers/net/can/sja1000/sja1000_of_platform.c
index
9793df6
..
cee6ba2
100644
(file)
--- a/
drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/
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>