diff -urdN -x CVS ../u-boot-cvs/u-boot/drivers/omap24xx_i2c.c ./drivers/omap24xx_i2c.c
--- ../u-boot-cvs/u-boot/drivers/omap24xx_i2c.c	Sun Jan  9 19:01:07 2005
+++ ./drivers/omap24xx_i2c.c	Mon Jan 10 11:22:31 2005
@@ -21,14 +21,15 @@
  */
 
 #include <common.h>
+
+#ifdef CONFIG_DRIVER_OMAP24XX_I2C
+
 #include <asm/arch/i2c.h>
 #include <asm/io.h>
 
 #define inw(a) __raw_readw(a)
 #define outw(a,v) __raw_writew(a,v)
 
-#ifdef CONFIG_DRIVER_OMAP24XX_I2C
-
 static void wait_for_bb (void);
 static u16 wait_for_pin (void);
 void flush_fifo(void);