[patch 12/15] mtd: nand: drop usage of cpu_is_* macro

[akpm at linux-foundation.org]

From: Kevin Hilman <khilman at deeprootsystems.com>

Usage of davinci-specific cpu_is macros is not allowed in drivers. 
These options should be passed in through platform_data.

Signed-off-by: Kevin Hilman <khilman at deeprootsystems.com>
Cc: David Brownell <david-b at pacbell.net>
Cc: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
---

 drivers/mtd/nand/davinci_nand.c |    3 ---
 1 file changed, 3 deletions(-)

diff -puN drivers/mtd/nand/davinci_nand.c~mtd-nand-drop-usage-of-cpu_is_-macro drivers/mtd/nand/davinci_nand.c
--- a/drivers/mtd/nand/davinci_nand.c~mtd-nand-drop-usage-of-cpu_is_-macro
+++ a/drivers/mtd/nand/davinci_nand.c
@@ -33,7 +33,6 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 
-#include <mach/cpu.h>
 #include <mach/nand.h>
 
 #include <asm/mach-types.h>
@@ -392,8 +391,6 @@ static int __init nand_davinci_probe(str
 	/* use board-specific ECC config; else, the best available */
 	if (pdata)
 		ecc_mode = pdata->ecc_mode;
-	else if (cpu_is_davinci_dm355())
-		ecc_mode = NAND_ECC_HW_SYNDROME;
 	else
 		ecc_mode = NAND_ECC_HW;
 
_