From patchwork Thu Nov 12 23:35:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 59675 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nACNan8k010319 for ; Thu, 12 Nov 2009 23:36:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755494AbZKLXfs (ORCPT ); Thu, 12 Nov 2009 18:35:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755287AbZKLXfr (ORCPT ); Thu, 12 Nov 2009 18:35:47 -0500 Received: from mail-px0-f188.google.com ([209.85.216.188]:49108 "EHLO mail-px0-f188.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755478AbZKLXfo (ORCPT ); Thu, 12 Nov 2009 18:35:44 -0500 Received: by pxi26 with SMTP id 26so2017875pxi.21 for ; Thu, 12 Nov 2009 15:35:50 -0800 (PST) Received: by 10.114.23.4 with SMTP id 4mr1229225waw.28.1258068950373; Thu, 12 Nov 2009 15:35:50 -0800 (PST) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 20sm1903696pzk.13.2009.11.12.15.35.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 12 Nov 2009 15:35:49 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Subject: [PATCH] OMAP3: keep SoC features on the same line Date: Thu, 12 Nov 2009 15:35:48 -0800 Message-Id: <1258068948-32700-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.5.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 441ca26..128e3f6 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"); } /*