diff options
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/orion_nand.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 4a3c6759492b..959fb86cda01 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
@@ -314,7 +314,7 @@ config MTD_ALAUDA | |||
314 | 314 | ||
315 | config MTD_NAND_ORION | 315 | config MTD_NAND_ORION |
316 | tristate "NAND Flash support for Marvell Orion SoC" | 316 | tristate "NAND Flash support for Marvell Orion SoC" |
317 | depends on ARCH_ORION && MTD_NAND | 317 | depends on PLAT_ORION && MTD_NAND |
318 | help | 318 | help |
319 | This enables the NAND flash controller on Orion machines. | 319 | This enables the NAND flash controller on Orion machines. |
320 | 320 | ||
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index 9162cca0182b..ec5ad28b237e 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c | |||
@@ -18,8 +18,8 @@ | |||
18 | #include <linux/mtd/partitions.h> | 18 | #include <linux/mtd/partitions.h> |
19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
20 | #include <asm/sizes.h> | 20 | #include <asm/sizes.h> |
21 | #include <asm/arch/platform.h> | ||
22 | #include <asm/arch/hardware.h> | 21 | #include <asm/arch/hardware.h> |
22 | #include <asm/plat-orion/orion_nand.h> | ||
23 | 23 | ||
24 | #ifdef CONFIG_MTD_CMDLINE_PARTS | 24 | #ifdef CONFIG_MTD_CMDLINE_PARTS |
25 | static const char *part_probes[] = { "cmdlinepart", NULL }; | 25 | static const char *part_probes[] = { "cmdlinepart", NULL }; |