Messages in this thread Patch in this message | | | From | "Mikael Starvik" <> | Subject | 2.6 [PATCH 4/6] CRIS architecture update | Date | Wed, 25 Aug 2004 11:13:49 +0200 |
| |
This patch contains changes related to drivers
diff -urNP --exclude='*.cvsignore' ../linux/arch/cris/arch-v10/drivers/i2c.c lx25/arch/cris/arch-v10/drivers/i2c.c --- ../linux/arch/cris/arch-v10/drivers/i2c.c Sat Aug 14 07:36:14 2004 +++ lx25/arch/cris/arch-v10/drivers/i2c.c Tue Aug 24 08:49:14 2004 @@ -12,6 +12,12 @@ *! don't use PB_I2C if DS1302 uses same bits, *! use PB. *! $Log: i2c.c,v $ +*! Revision 1.9 2004/08/24 06:49:14 starvik +*! Whitespace cleanup +*! +*! Revision 1.8 2004/06/08 08:48:26 starvik +*! Removed unused code +*! *! Revision 1.7 2004/05/28 09:26:59 starvik *! Modified I2C initialization to work in 2.6. *! @@ -69,7 +75,7 @@ *! (C) Copyright 1999-2002 Axis Communications AB, LUND, SWEDEN *! *!************************************************************************** */ -/* $Id: i2c.c,v 1.7 2004/05/28 09:26:59 starvik Exp $ */ +/* $Id: i2c.c,v 1.9 2004/08/24 06:49:14 starvik Exp $ */ /****************** INCLUDE FILES SECTION ***********************************/ @@ -110,14 +116,6 @@ #define I2C_DATA_HIGH 1 #define I2C_DATA_LOW 0 -#if 0 -/* TODO: fix this so the CONFIG_ETRAX_I2C_USES... is set in Config.in instead */ -#if defined(CONFIG_DS1302) && (CONFIG_DS1302_SDABIT==0) && \ - (CONFIG_DS1302_SCLBIT == 1) -#define CONFIG_ETRAX_I2C_USES_PB_NOT_PB_I2C -#endif -#endif - #ifdef CONFIG_ETRAX_I2C_USES_PB_NOT_PB_I2C /* Use PB and not PB_I2C */ #ifndef CONFIG_ETRAX_I2C_DATA_PORT - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |