The patch titled mtd: nand: drop usage of cpu_is_* macro has been added to the -mm tree. Its filename is mtd-nand-drop-usage-of-cpu_is_-macro.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mtd: nand: drop usage of cpu_is_* macro From: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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; _ Patches currently in -mm which might be from khilman@xxxxxxxxxxxxxxxxxxx are linux-next.patch mtd-nand-drop-usage-of-cpu_is_-macro.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html