lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'gcl/merge' into next

Browse Source 
Manual merge of:
	drivers/net/fec_mpc52xx.c
This commit is contained in:
Benjamin Herrenschmidt
2009-06-18 11:22:08 +10:00
parent 4b337c5f24 e7c5a4f292
commit b71a107c66
18 changed files with 91 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/i2c/busses/i2c-mpc.c
View File

@@ -197,7 +197,7 @@ int mpc_i2c_get_fdr_52xx(struct device_node *node, u32 clock, int prescaler)
return -EINVAL;
/* Determine divider value */
divider = mpc52xx_find_ipb_freq(node) / clock;
divider = mpc5xxx_get_bus_frequency(node) / clock;
/*
* We want to choose an FDR/DFSR that generates an I2C bus speed that