projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6
[linux-2.6-block.git]
/
drivers
/
pcmcia
/
sa11xx_base.c
diff --git
a/drivers/pcmcia/sa11xx_base.c
b/drivers/pcmcia/sa11xx_base.c
index 31a7abc55b23a5b3056fc1b7f86756d07d0ee92d..7cb1273202cc6adbf97ea60c83d0abf8425e3bdb 100644
(file)
--- a/
drivers/pcmcia/sa11xx_base.c
+++ b/
drivers/pcmcia/sa11xx_base.c
@@
-37,7
+37,7
@@
#include <linux/kernel.h>
#include <linux/spinlock.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/system.h>