git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd
[sfrench/cifs-2.6.git]
/
drivers
/
mtd
/
nand
/
h1910.c
diff --git
a/drivers/mtd/nand/h1910.c
b/drivers/mtd/nand/h1910.c
index 85e55a5eb2ff499fae38f0d82f557672b0b21b5e..50166e93ba96696e562d201c694dcdb51488bb14 100644
(file)
--- a/
drivers/mtd/nand/h1910.c
+++ b/
drivers/mtd/nand/h1910.c
@@
-24,7
+24,7
@@
#include <linux/mtd/nand.h>
#include <linux/mtd/partitions.h>
#include <asm/io.h>
-#include <mach/hardware.h>
/* for CLPS7111_VIRT_BASE */
+#include <mach/hardware.h>
#include <asm/sizes.h>
#include <mach/h1900-gpio.h>
#include <mach/ipaq.h>