From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve Sakoman Date: Wed, 18 Aug 2010 20:29:25 -0700 Subject: [U-Boot] [PATCH 1/3] i2c: omap2+: change header guard to be generic In-Reply-To: <1282178349-24593-2-git-send-email-nm@ti.com> References: <1282178349-24593-2-git-send-email-nm@ti.com> Message-ID: <1282188565.2052.84.camel@quadra> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed, 2010-08-18 at 19:39 -0500, Nishanth Menon wrote: > Make the header guard to be generic to stop conflicting with > omap2 i2c header file arch/arm/include/asm/arch-omap24xx/i2c.h > > Cc: Steve Sakoman > Cc: Heiko > Cc: Sandeep Paulraj > Cc: Wolfang Denk > > Signed-off-by: Nishanth Menon Acked-by: Steve Sakoman Steve > --- > drivers/i2c/omap24xx_i2c.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/omap24xx_i2c.h b/drivers/i2c/omap24xx_i2c.h > index 650e33a..1f38c23 100644 > --- a/drivers/i2c/omap24xx_i2c.h > +++ b/drivers/i2c/omap24xx_i2c.h > @@ -20,8 +20,8 @@ > * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > * MA 02111-1307 USA > */ > -#ifndef _OMAP24XX_I2C_H_ > -#define _OMAP24XX_I2C_H_ > +#ifndef _OMAP2PLUS_I2C_H_ > +#define _OMAP2PLUS_I2C_H_ > > /* I2C masks */ >