summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2007-03-08 23:06:12 +0100
committerWolfgang Denk <wd@denx.de>2007-03-08 23:06:12 +0100
commitcf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 (patch)
tree1737a3fe7a054b35831605f17b3f2649595b2a57 /cpu
parenteb92f613556800f7483666db09d9a237ad911d4a (diff)
parent992423ab43c2bcf6b704853bd00af77450915e20 (diff)
downloadu-boot-imx-cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093.zip
u-boot-imx-cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093.tar.gz
u-boot-imx-cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093.tar.bz2
Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ppc4xx/i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/ppc4xx/i2c.c b/cpu/ppc4xx/i2c.c
index 0b056a1..8f4da86 100644
--- a/cpu/ppc4xx/i2c.c
+++ b/cpu/ppc4xx/i2c.c
@@ -460,6 +460,7 @@ int i2c_set_bus_num(unsigned int bus)
return 0;
}
+#endif /* CONFIG_I2C_MULTI_BUS */
/* TODO: add 100/400k switching */
unsigned int i2c_get_bus_speed(void)
@@ -474,5 +475,4 @@ int i2c_set_bus_speed(unsigned int speed)
return 0;
}
-#endif /* CONFIG_I2C_MULTI_BUS */
#endif /* CONFIG_HARD_I2C */