omap3: keep SoC features on the same line

When listing the various SoC features, print them on the same line.
So, instead of this

OMAP3430/3530 ES3.1
 - l2cache : Y
 - iva : Y
 - sgx : Y
 - neon : Y
 - isp : Y

you get this:

OMAP3430/3530 ES3.1 (l2cache iva sgx neon isp )

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 6c11b41b4d44..49846601fe77 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -257,11 +257,8 @@ void __init omap3_check_revision(void)
 }
 
 #define OMAP3_SHOW_FEATURE(feat)                \
-        if (omap3_has_ ##feat()) {              \
-                pr_info (" - "#feat" : Y");     \
-        } else {                                \
-                pr_info (" - "#feat" : N");     \
-        }
+        if (omap3_has_ ##feat())                \
+                printk(#feat" ");
 
 void __init omap3_cpuinfo(void)
 {
@@ -331,13 +328,15 @@ void __init omap3_cpuinfo(void)
         /*
          * Print verbose information
          */
-        pr_info("%s ES%s\n", cpu_name, cpu_rev);
+        pr_info("%s ES%s (", cpu_name, cpu_rev);
 
         OMAP3_SHOW_FEATURE(l2cache);
         OMAP3_SHOW_FEATURE(iva);
         OMAP3_SHOW_FEATURE(sgx);
         OMAP3_SHOW_FEATURE(neon);
         OMAP3_SHOW_FEATURE(isp);
+
+        printk(")\n");
 }
 
 /*