projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release', 'bugzilla-12011', 'bugzilla-12632', 'misc' and 'suspend...
[cascardo/linux.git]
/
drivers
/
pcmcia
/
pxa2xx_sharpsl.c
diff --git
a/drivers/pcmcia/pxa2xx_sharpsl.c
b/drivers/pcmcia/pxa2xx_sharpsl.c
index
d71f93d
..
1cd02f5
100644
(file)
--- a/
drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/
drivers/pcmcia/pxa2xx_sharpsl.c
@@
-19,7
+19,7
@@
#include <linux/platform_device.h>
#include <asm/mach-types.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/irq.h>
#include <asm/hardware/scoop.h>