diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 01:22:08 (GMT) |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 01:22:08 (GMT) |
| commit | b71a107c66ad952c9d35ec046a803efc89a80556 (patch) | |
| tree | eb1f77af4f14974ba40a413d7679b3a451295a3d /drivers/serial | |
| parent | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (diff) | |
| parent | e7c5a4f292e0d1f4ba9a3a94b2c8e8b71e35b25a (diff) | |
| download | linux-b71a107c66ad952c9d35ec046a803efc89a80556.tar.xz | |
Merge commit 'gcl/merge' into next
Manual merge of:
drivers/net/fec_mpc52xx.c
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index b3feb61..abbd146 100644 --- a/drivers/serial/mpc52xx_uart.c +++ b/drivers/serial/mpc52xx_uart.c @@ -76,7 +76,6 @@ #include <linux/of_platform.h> #include <asm/mpc52xx.h> -#include <asm/mpc512x.h> #include <asm/mpc52xx_psc.h> #if defined(CONFIG_SERIAL_MPC52xx_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) @@ -254,7 +253,7 @@ static unsigned long mpc52xx_getuartclk(void *p) * but the generic serial code assumes 16 * so return ipb freq / 2 */ - return mpc52xx_find_ipb_freq(p) / 2; + return mpc5xxx_get_bus_frequency(p) / 2; } static struct psc_ops mpc52xx_psc_ops = { @@ -391,7 +390,7 @@ static void mpc512x_psc_cw_restore_ints(struct uart_port *port) static unsigned long mpc512x_getuartclk(void *p) { - return mpc512x_find_ips_freq(p); + return mpc5xxx_get_bus_frequency(p); } static struct psc_ops mpc512x_psc_ops = { |