diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:22:08 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:22:08 -0400 |
| commit | b71a107c66ad952c9d35ec046a803efc89a80556 (patch) | |
| tree | eb1f77af4f14974ba40a413d7679b3a451295a3d /drivers/i2c/busses | |
| parent | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (diff) | |
| parent | e7c5a4f292e0d1f4ba9a3a94b2c8e8b71e35b25a (diff) | |
Merge commit 'gcl/merge' into next
Manual merge of:
drivers/net/fec_mpc52xx.c
Diffstat (limited to 'drivers/i2c/busses')
| -rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index dd778d7ae047..d325e86e3103 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
| @@ -197,7 +197,7 @@ int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler) | |||
| 197 | return -EINVAL; | 197 | return -EINVAL; |
| 198 | 198 | ||
| 199 | /* Determine divider value */ | 199 | /* Determine divider value */ |
| 200 | divider = mpc52xx_find_ipb_freq(node) / clock; | 200 | divider = mpc5xxx_get_bus_frequency(node) / clock; |
| 201 | 201 | ||
| 202 | /* | 202 | /* |
| 203 | * We want to choose an FDR/DFSR that generates an I2C bus speed that | 203 | * We want to choose an FDR/DFSR that generates an I2C bus speed that |