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
[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
[safe/jmp/linux-2.6]
/
drivers
/
mtd
/
maps
/
ipaq-flash.c
diff --git
a/drivers/mtd/maps/ipaq-flash.c
b/drivers/mtd/maps/ipaq-flash.c
index
6447e8b
..
ed58f6a
100644
(file)
--- a/
drivers/mtd/maps/ipaq-flash.c
+++ b/
drivers/mtd/maps/ipaq-flash.c
@@
-24,8
+24,8
@@
#include <linux/mtd/concat.h>
#endif
-#include <
asm/ar
ch/hardware.h>
-#include <
asm/ar
ch/h3600.h>
+#include <
ma
ch/hardware.h>
+#include <
ma
ch/h3600.h>
#include <asm/io.h>