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 branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
can
/
janz-ican3.c
diff --git
a/drivers/net/can/janz-ican3.c
b/drivers/net/can/janz-ican3.c
index
f1942ca
..
32778d5
100644
(file)
--- a/
drivers/net/can/janz-ican3.c
+++ b/
drivers/net/can/janz-ican3.c
@@
-22,6
+22,7
@@
#include <linux/can/error.h>
#include <linux/mfd/janz.h>
+#include <asm/io.h>
/* the DPM has 64k of memory, organized into 256x 256 byte pages */
#define DPM_NUM_PAGES 256