diff options
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/ams-delta.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/au1550nd.c | 6 | ||||
| -rw-r--r-- | drivers/mtd/nand/cafe_nand.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/cmx270_nand.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/diskonchip.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_bbt.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/sm_common.c | 1 |
9 files changed, 13 insertions, 3 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 22db2b9114d..cce7b70824c 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -132,7 +132,7 @@ config MTD_NAND_RICOH config MTD_NAND_AU1550 tristate "Au1550/1200 NAND support" - depends on SOC_AU1200 || SOC_AU1550 + depends on MIPS_ALCHEMY help This enables the driver for the NAND flash controller on the AMD/Alchemy 1550 SOC. diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c index 78017eb9318..9e6b498c9be 100644 --- a/drivers/mtd/nand/ams-delta.c +++ b/drivers/mtd/nand/ams-delta.c @@ -26,7 +26,7 @@ #include <asm/io.h> #include <mach/hardware.h> #include <asm/sizes.h> -#include <mach/gpio.h> +#include <asm/gpio.h> #include <plat/board-ams-delta.h> /* diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c index 60d58d3f1fc..7dd3700f230 100644 --- a/drivers/mtd/nand/au1550nd.c +++ b/drivers/mtd/nand/au1550nd.c @@ -19,7 +19,11 @@ #include <linux/mtd/partitions.h> #include <asm/io.h> -#include <asm/mach-au1x00/au1xxx.h> +#ifdef CONFIG_MIPS_PB1550 +#include <asm/mach-pb1x00/pb1550.h> +#elif defined(CONFIG_MIPS_DB1550) +#include <asm/mach-db1x00/db1x00.h> +#endif #include <asm/mach-db1x00/bcsr.h> /* diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index 11a56df89ea..72d3f23490c 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c @@ -21,6 +21,7 @@ #include <linux/interrupt.h> #include <linux/dma-mapping.h> #include <linux/slab.h> +#include <linux/module.h> #include <asm/io.h> #define CAFE_NAND_CTRL1 0x00 diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c index 31308e694bd..737ef9a04fd 100644 --- a/drivers/mtd/nand/cmx270_nand.c +++ b/drivers/mtd/nand/cmx270_nand.c @@ -22,6 +22,7 @@ #include <linux/mtd/partitions.h> #include <linux/slab.h> #include <linux/gpio.h> +#include <linux/module.h> #include <asm/io.h> #include <asm/irq.h> diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index ae8c60d604c..5780dbab611 100644 --- a/drivers/mtd/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c @@ -31,6 +31,7 @@ #include <linux/mtd/doc2000.h> #include <linux/mtd/partitions.h> #include <linux/mtd/inftl.h> +#include <linux/module.h> /* Where to look for the devices? */ #ifndef CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 5c9c0b2f09d..69148ae3bf5 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -67,6 +67,7 @@ #include <linux/bitops.h> #include <linux/delay.h> #include <linux/vmalloc.h> +#include <linux/export.h> static int check_pattern_no_oob(uint8_t *buf, struct nand_bbt_descr *td) { diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 19b283f2c80..f745f00f316 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -11,6 +11,7 @@ #include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/delay.h> +#include <linux/module.h> #include <linux/interrupt.h> #include <linux/jiffies.h> #include <linux/sched.h> diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c index 2c438ef53cf..32ae5af7444 100644 --- a/drivers/mtd/nand/sm_common.c +++ b/drivers/mtd/nand/sm_common.c @@ -8,6 +8,7 @@ */ #include <linux/kernel.h> #include <linux/mtd/nand.h> +#include <linux/module.h> #include "sm_common.h" static struct nand_ecclayout nand_oob_sm = { |