public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Sanjeev Premi <premi@ti.com>
To: linux-omap@vger.kernel.org
Cc: Sanjeev Premi <premi@ti.com>
Subject: [PATCH] Fix mismatched ifdefs
Date: Mon, 17 Aug 2009 16:29:15 +0530	[thread overview]
Message-ID: <1250506755-920-1-git-send-email-premi@ti.com> (raw)

The #endif at end of the file was missing. However, an
additional #else ... #endif was causing the compiler to
keep going.

The problem was found when compiler started reporting
the newly added inline functions were being reported as
redeclared by the compiler.

Signed-off-by: Sanjeev Premi <premi@ti.com>
---
 arch/arm/plat-omap/include/mach/cpu.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h
index 11e73d9..4fbc6a9 100644
--- a/arch/arm/plat-omap/include/mach/cpu.h
+++ b/arch/arm/plat-omap/include/mach/cpu.h
@@ -317,8 +317,6 @@ IS_OMAP_TYPE(3430, 0x3430)
 #  undef  cpu_is_omap730
 #  define cpu_is_omap730()		1
 # endif
-#endif
-#else
 # if defined(CONFIG_ARCH_OMAP850)
 #  undef  cpu_is_omap850
 #  define cpu_is_omap850()		1
@@ -433,3 +431,5 @@ IS_OMAP_TYPE(3430, 0x3430)
 
 int omap_chip_is(struct omap_chip_id oci);
 void omap2_check_revision(void);
+
+#endif	/* __ASM_ARCH_OMAP_CPU_H */
-- 
1.6.2.2


             reply	other threads:[~2009-08-17 10:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-17 10:59 Sanjeev Premi [this message]
2009-08-17 14:45 ` [PATCH] Fix mismatched ifdefs Tony Lindgren
2009-08-17 14:56   ` Premi, Sanjeev
2009-08-18 10:00     ` [PATCH] OMAP: Fix incorrect 730 vs 850 detection (Re: [PATCH] Fix mismatched ifdefs) Tony Lindgren
2009-08-18 13:57       ` Premi, Sanjeev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1250506755-920-1-git-send-email-premi@ti.com \
    --to=premi@ti.com \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox