linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/11] omap: i2c: Avoid compilation error in case the header is included multiple times
Date: Thu, 23 Sep 2010 18:51:05 -0700	[thread overview]
Message-ID: <20100924015105.10325.65902.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100924014938.10325.35279.stgit@baageli.muru.com>

From: Subramaniam C.A <subramaniam.ca@ti.com>

Added defines to avoid compilation error.

Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/plat-omap/include/plat/i2c.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h
index 87f6bf2..36a0bef 100644
--- a/arch/arm/plat-omap/include/plat/i2c.h
+++ b/arch/arm/plat-omap/include/plat/i2c.h
@@ -18,6 +18,8 @@
  * 02110-1301 USA
  *
  */
+#ifndef __ASM__ARCH_OMAP_I2C_H
+#define __ASM__ARCH_OMAP_I2C_H
 
 #include <linux/i2c.h>
 
@@ -36,3 +38,5 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
 
 void __init omap1_i2c_mux_pins(int bus_id);
 void __init omap2_i2c_mux_pins(int bus_id);
+
+#endif /* __ASM__ARCH_OMAP_I2C_H */

  parent reply	other threads:[~2010-09-24  1:51 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-24  1:50 [PATCH 00/11] omap patches for review for v2.6.37 merge window Tony Lindgren
2010-09-24  1:50 ` [PATCH 01/11] omap2: fix assorted compiler warnings Tony Lindgren
2010-09-24  1:50 ` [PATCH 02/11] omap: n8x0: Cleanup i2c1 and menelaus registration Tony Lindgren
2010-09-24  1:50 ` [PATCH 03/11] omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810 Tony Lindgren
2010-09-24  1:50 ` [PATCH 04/11] omap: n8x0: Mux i2s codec port pins for McBSP block Tony Lindgren
2010-09-24  1:50 ` [PATCH 05/11] omap3: Remove non-existent config option Tony Lindgren
2010-09-24 10:00   ` Felipe Contreras
2010-09-24 15:17     ` Premi, Sanjeev
2010-09-25 15:42       ` Felipe Contreras
2010-09-27 11:02         ` Marathe, Yogesh
2010-09-27 15:56           ` Felipe Contreras
2010-09-27 16:24             ` Tony Lindgren
2010-09-27 16:28             ` Kanigeri, Hari
2010-09-29 11:34               ` Felipe Contreras
2010-09-29 13:28                 ` Marathe, Yogesh
2010-09-29 19:12                   ` Felipe Contreras
2010-10-01 11:29                     ` Marathe, Yogesh
2010-10-06  0:14                       ` Guzman Lugo, Fernando
2010-10-06  8:31                         ` Marathe, Yogesh
2010-10-10 14:07                         ` Felipe Contreras
2010-10-11  5:10                           ` Marathe, Yogesh
2010-09-24  1:50 ` [PATCH 06/11] omap: usb: fix build warning Tony Lindgren
2010-09-24  1:51 ` [PATCH 07/11] omap: crypto: updates to enable omap aes Tony Lindgren
2010-09-24  1:51 ` Tony Lindgren [this message]
2010-09-24  1:51 ` [PATCH 09/11] omap: McBSP: Do not enable SRG in slave mode Tony Lindgren
2010-09-24  1:51 ` [PATCH 10/11] omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and docleanups Tony Lindgren
2010-09-24  1:51 ` [PATCH 11/11] omap: mmc: extended to pass host capabilities from board file Tony Lindgren
2010-09-24  5:53 ` [PATCH 00/11] omap patches for review for v2.6.37 merge window Jarkko Nikula
2010-09-24 18:12   ` Tony Lindgren

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=20100924015105.10325.65902.stgit@baageli.muru.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).