git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ 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/brodo/pcmcia-2.6
[safe/jmp/linux-2.6]
/
drivers
/
pcmcia
/
sa11xx_base.c
diff --git
a/drivers/pcmcia/sa11xx_base.c
b/drivers/pcmcia/sa11xx_base.c
index
31a7abc
..
7cb1273
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>