diff options
| author | Aubrey Li <aubrey.adi@gmail.com> | 2007-03-19 23:01:15 +0800 |
|---|---|---|
| committer | Aubrey Li <aubrey.adi@gmail.com> | 2007-03-19 23:01:15 +0800 |
| commit | a20e7106928a284a6d14c066c54b72e552075b06 (patch) | |
| tree | e3dde666da99073732b97778e030d1beb0e75c09 /cpu | |
| parent | a6154fd1cfd020f6da8527e0365b1020a11a71d0 (diff) | |
| parent | cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 (diff) | |
| download | u-boot-a20e7106928a284a6d14c066c54b72e552075b06.tar.gz u-boot-a20e7106928a284a6d14c066c54b72e552075b06.tar.xz u-boot-a20e7106928a284a6d14c066c54b72e552075b06.zip | |
Merge http://www.denx.de/git/u-boot
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/ppc4xx/i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/ppc4xx/i2c.c b/cpu/ppc4xx/i2c.c index 0b056a15de..8f4da8621d 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 */ |