summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorAubrey Li <aubrey.adi@gmail.com>2007-03-19 23:01:15 +0800
committerAubrey Li <aubrey.adi@gmail.com>2007-03-19 23:01:15 +0800
commita20e7106928a284a6d14c066c54b72e552075b06 (patch)
treee3dde666da99073732b97778e030d1beb0e75c09 /cpu
parenta6154fd1cfd020f6da8527e0365b1020a11a71d0 (diff)
parentcf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 (diff)
downloadu-boot-imx-a20e7106928a284a6d14c066c54b72e552075b06.zip
u-boot-imx-a20e7106928a284a6d14c066c54b72e552075b06.tar.gz
u-boot-imx-a20e7106928a284a6d14c066c54b72e552075b06.tar.bz2
Merge http://www.denx.de/git/u-boot
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 */