projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
drivers
/
pcmcia
/
sa1100_shannon.c
diff --git
a/drivers/pcmcia/sa1100_shannon.c
b/drivers/pcmcia/sa1100_shannon.c
index
decb347
..
56ab739
100644
(file)
--- a/
drivers/pcmcia/sa1100_shannon.c
+++ b/
drivers/pcmcia/sa1100_shannon.c
@@
-8,6
+8,7
@@
#include <linux/kernel.h>
#include <linux/device.h>
#include <linux/init.h>
+#include <linux/io.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>