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 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
can
/
softing
/
softing_fw.c
diff --git
a/drivers/net/can/softing/softing_fw.c
b/drivers/net/can/softing/softing_fw.c
index
b520784
..
3105961
100644
(file)
--- a/
drivers/net/can/softing/softing_fw.c
+++ b/
drivers/net/can/softing/softing_fw.c
@@
-20,6
+20,7
@@
#include <linux/firmware.h>
#include <linux/sched.h>
#include <asm/div64.h>
+#include <asm/io.h>
#include "softing.h"