diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 20:21:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 20:21:46 +0200 |
| commit | aaad5cbad757b21457874a6b7adbeaaad36a0ce3 (patch) | |
| tree | 55a34386c6229c1f245638f5ad014800c9c33eb9 /drivers/mtd | |
| parent | 09efce4ad3c08b89291cedffa054e03ef44f521a (diff) | |
| parent | a4c86922406104f615c179bdaecf47d1ab56c995 (diff) | |
| download | barebox-aaad5cbad757b21457874a6b7adbeaaad36a0ce3.tar.gz barebox-aaad5cbad757b21457874a6b7adbeaaad36a0ce3.tar.xz | |
Merge branch 'for-next/clk' into for-next/imx
Conflicts:
drivers/net/fec_imx.c
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_imx.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index b1b7f55e0e..0489d098b7 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -1107,12 +1107,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); |