diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:09 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:09 +0100 |
commit | bf38ac7b89dee71d14d4d65e9ad0d0cb727cbb98 (patch) | |
tree | 3cf8336e5c2c6341120a2b68f8bb7a5df385fb64 /drivers/mtd | |
parent | 38c75d0f112d4e8bc3762cd8d0b6dbae3cf7e441 (diff) | |
parent | 4f2ac27e2503e15bffdebca4757e02638686fe94 (diff) | |
download | barebox-bf38ac7b89dee71d14d4d65e9ad0d0cb727cbb98.tar.gz barebox-bf38ac7b89dee71d14d4d65e9ad0d0cb727cbb98.tar.xz |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/boards/guf-neso/lowlevel.c
arch/arm/boards/pcm038/lowlevel.c
commands/Makefile
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/nand_imx.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index ef927c5816..7a207e3236 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -26,7 +26,6 @@ #include <linux/mtd/nand.h> #include <mach/generic.h> #include <mach/imx-nand.h> -#include <mach/imx-regs.h> #include <io.h> #include <errno.h> @@ -1107,12 +1106,6 @@ static int __init imxnd_probe(struct device_d *dev) struct nand_ecclayout *oob_smallpage, *oob_largepage, *oob_4kpage; int err = 0; -#ifdef CONFIG_ARCH_IMX27 - PCCR1 |= PCCR1_NFC_BAUDEN; -#endif -#ifdef CONFIG_ARCH_IMX21 - PCCR0 |= PCCR0_NFC_EN; -#endif /* Allocate memory for MTD device structure and private data */ host = kzalloc(sizeof(struct imx_nand_host) + NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE, GFP_KERNEL); |