projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
drivers
/
i2c
/
omap24xx_i2c.c
diff --git
a/drivers/i2c/omap24xx_i2c.c
b/drivers/i2c/omap24xx_i2c.c
index
7dab786
..
d16cfb1
100644
(file)
--- a/
drivers/i2c/omap24xx_i2c.c
+++ b/
drivers/i2c/omap24xx_i2c.c
@@
-22,8
+22,6
@@
#include <common.h>
-#ifdef CONFIG_DRIVER_OMAP24XX_I2C
-
#include <asm/arch/i2c.h>
#include <asm/io.h>
@@
-325,5
+323,3
@@
static u16 wait_for_pin (void)
}
return status;
}
-
-#endif /* CONFIG_DRIVER_OMAP24XX_I2C */