the macro CONFIG_ETRAXFS is used in wrong position - all the port[1] related
stuff should be used only when CONFIG_ETRAXFS is enabled.
Signed-off-by: Cong Ding <ding...@gmail.com>
---
arch/cris/arch-v32/drivers/sync_serial.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c
b/arch/cris/arch-v32/drivers/sync_serial.c
index a6a180b..f600cd3 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -276,6 +276,7 @@ static int __init etrax_sync_serial_init(void)
initialize_port(0);
#endif
+#ifdef CONFIG_ETRAXFS
#if defined(CONFIG_ETRAX_SYNCHRONOUS_SERIAL_PORT1)
if (crisv32_pinmux_alloc_fixed(pinmux_sser1)) {
printk(KERN_WARNING
@@ -285,12 +286,10 @@ static int __init etrax_sync_serial_init(void)
ports[1].enabled = 1;
initialize_port(1);
#endif
-
-#ifdef CONFIG_ETRAXFS
printk(KERN_INFO "ETRAX FS synchronous serial port driver\n");
-#else
+#else /* CONFIG_ETRAXFS */
printk(KERN_INFO "Artpec-3 synchronous serial port driver\n");
-#endif
+#endif /* CONFIG_ETRAXFS */
return 0;
}
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
