summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-02-20 12:18:59 -0500
committerTom Rini <trini@ti.com>2014-02-20 12:18:59 -0500
commit6853e6aa77b388998a5368b400aee3ae7776b1c2 (patch)
treee91dfbc15a79c452fa50d8896d5e8eb10aa1771d /drivers/i2c
parent130fbeb1c51f19a2b81c4e27d23da735b5b235d4 (diff)
parent3e11350255d9c5d4bd03c2a65769da84c05d3294 (diff)
downloadblackbird-obmc-uboot-6853e6aa77b388998a5368b400aee3ae7776b1c2.tar.gz
blackbird-obmc-uboot-6853e6aa77b388998a5368b400aee3ae7776b1c2.zip
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/soft_i2c.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index dfea54ae73..db9b4026b3 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -29,9 +29,6 @@
#include <asm/arch/gpio.h>
#endif
#endif
-#ifdef CONFIG_IXP425 /* only valid for IXP425 */
-#include <asm/arch/ixp425.h>
-#endif
#if defined(CONFIG_MPC852T) || defined(CONFIG_MPC866)
#include <asm/io.h>
#endif
OpenPOWER on IntegriCloud