diff options
Diffstat (limited to 'arch/arm/mach-nomadik')
-rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-nomadik/include/mach/nand.h | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index f4535a7dadf5..381c08027df4 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <plat/gpio-nomadik.h> | 34 | #include <plat/gpio-nomadik.h> |
35 | #include <plat/mtu.h> | 35 | #include <plat/mtu.h> |
36 | 36 | ||
37 | #include <mach/nand.h> | 37 | #include <linux/platform_data/mtd-nomadik-nand.h> |
38 | #include <mach/fsmc.h> | 38 | #include <mach/fsmc.h> |
39 | 39 | ||
40 | #include "cpu-8815.h" | 40 | #include "cpu-8815.h" |
diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/arch/arm/mach-nomadik/include/mach/nand.h deleted file mode 100644 index c3c8254c22a5..000000000000 --- a/arch/arm/mach-nomadik/include/mach/nand.h +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | #ifndef __ASM_ARCH_NAND_H | ||
2 | #define __ASM_ARCH_NAND_H | ||
3 | |||
4 | struct nomadik_nand_platform_data { | ||
5 | struct mtd_partition *parts; | ||
6 | int nparts; | ||
7 | int options; | ||
8 | int (*init) (void); | ||
9 | int (*exit) (void); | ||
10 | }; | ||
11 | |||
12 | #define NAND_IO_DATA 0x40000000 | ||
13 | #define NAND_IO_CMD 0x40800000 | ||
14 | #define NAND_IO_ADDR 0x41000000 | ||
15 | |||
16 | #endif /* __ASM_ARCH_NAND_H */ | ||