Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / arch / arm / mach-davinci / board-neuros-osd2.c

diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index bb680af..8fcdcf8 100644 (file)
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -183,9 +183,8 @@ static __init void davinci_ntosd2_init(void)
 
        if (HAS_ATA) {
                if (HAS_NAND)
-                       pr_warning("WARNING: both IDE and Flash are "
-                               "enabled, but they share AEMIF pins.\n"
-                               "\tDisable IDE for NAND/NOR support.\n");
+                       pr_warn("WARNING: both IDE and Flash are enabled, but they share AEMIF pins\n"
+                               "\tDisable IDE for NAND/NOR support\n");
                davinci_init_ide();
        } else if (HAS_NAND) {
                davinci_cfg_reg(DM644X_HPIEN_DISABLE);