The patch titled Subject: mn10300: use "#elif defined(CONFIG_*)" instead of "#elif CONFIG_*" has been added to the -mm tree. Its filename is mn10300-use-elif-definedconfig_-instead-of-elif-config_.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Subject: mn10300: use "#elif defined(CONFIG_*)" instead of "#elif CONFIG_*" arch/mn10300/kernel/irq.c:173:7: warning: "CONFIG_MN10300_TTYSM1_TIMER9" is not defined [-Wundef] arch/mn10300/kernel/irq.c:175:7: warning: "CONFIG_MN10300_TTYSM1_TIMER3" is not defined [-Wundef] Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Koichi Yasutake <yasutake.koichi@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/mn10300/kernel/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/mn10300/kernel/irq.c~mn10300-use-elif-definedconfig_-instead-of-elif-config_ arch/mn10300/kernel/irq.c --- a/arch/mn10300/kernel/irq.c~mn10300-use-elif-definedconfig_-instead-of-elif-config_ +++ a/arch/mn10300/kernel/irq.c @@ -170,9 +170,9 @@ mn10300_cpupic_setaffinity(struct irq_da case SC1TXIRQ: #ifdef CONFIG_MN10300_TTYSM1_TIMER12 case TM12IRQ: -#elif CONFIG_MN10300_TTYSM1_TIMER9 +#elif defined(CONFIG_MN10300_TTYSM1_TIMER9) case TM9IRQ: -#elif CONFIG_MN10300_TTYSM1_TIMER3 +#elif defined(CONFIG_MN10300_TTYSM1_TIMER3) case TM3IRQ: #endif /* CONFIG_MN10300_TTYSM1_TIMER12 */ #endif /* CONFIG_MN10300_TTYSM1 */ _ Subject: Subject: mn10300: use "#elif defined(CONFIG_*)" instead of "#elif CONFIG_*" Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are origin.patch linux-next.patch xtensa-replace-xtensa-specific-_fdatatext-by-_sdatatext.patch xtensa-use-test-e-instead-of-bashism-test-a.patch xtensa-use-the-declarations-provided-by-asm-sectionsh.patch h8300-fix-use-of-extinct-_sbss-and-_ebss.patch h8300-use-the-declarations-provided-by-asm-sectionsh.patch mn10300-move-setup_jiffies_interrupt-to-cevt-mn10300c.patch mn10300-remove-duplicate-definition-of-ptrace_o_tracesysgood.patch mn10300-kernel-internalh-needs-linux-irqreturnh.patch mn10300-kernel-trapsc-needs-linux-exporth.patch mn10300-mm-dma-allocc-needs-linux-exporth.patch mn10300-use-elif-definedconfig_-instead-of-elif-config_.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