diff options
-rw-r--r-- | drivers/mtd/onenand/samsung.c | 4 | ||||
-rw-r--r-- | drivers/mtd/onenand/samsung.h (renamed from arch/arm/plat-samsung/include/plat/regs-onenand.h) | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index 33f2a8fb8df9..2cf74085f935 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/onenand/samsung.c | |||
@@ -23,11 +23,11 @@ | |||
23 | #include <linux/mtd/partitions.h> | 23 | #include <linux/mtd/partitions.h> |
24 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
26 | #include <linux/io.h> | ||
26 | 27 | ||
27 | #include <asm/mach/flash.h> | 28 | #include <asm/mach/flash.h> |
28 | #include <plat/regs-onenand.h> | ||
29 | 29 | ||
30 | #include <linux/io.h> | 30 | #include "samsung.h" |
31 | 31 | ||
32 | enum soc_type { | 32 | enum soc_type { |
33 | TYPE_S3C6400, | 33 | TYPE_S3C6400, |
diff --git a/arch/arm/plat-samsung/include/plat/regs-onenand.h b/drivers/mtd/onenand/samsung.h index 930ea8b88ed3..c4a80e67e438 100644 --- a/arch/arm/plat-samsung/include/plat/regs-onenand.h +++ b/drivers/mtd/onenand/samsung.h | |||
@@ -11,8 +11,6 @@ | |||
11 | #ifndef __SAMSUNG_ONENAND_H__ | 11 | #ifndef __SAMSUNG_ONENAND_H__ |
12 | #define __SAMSUNG_ONENAND_H__ | 12 | #define __SAMSUNG_ONENAND_H__ |
13 | 13 | ||
14 | #include <mach/hardware.h> | ||
15 | |||
16 | /* | 14 | /* |
17 | * OneNAND Controller | 15 | * OneNAND Controller |
18 | */ | 16 | */ |