Merge tag 'v3.9-rc3' into drm-intel-next-queued

[~andy/linux] / arch / mips / netlogic / xlr / setup.c

diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
index c5ce6992ac4c7086aea4167a7460723a5d0cb7be..e3e094100e3e51f2ea879431f85a9512d84e22a4 100644 (file)
--- a/arch/mips/netlogic/xlr/setup.c
+++ b/arch/mips/netlogic/xlr/setup.c
@@ -70,7 +70,7 @@ static void __init nlm_early_serial_setup(void)
        s.iotype        = UPIO_MEM32;
        s.regshift      = 2;
        s.irq           = PIC_UART_0_IRQ;
-       s.uartclk       = PIC_CLKS_PER_SEC;
+       s.uartclk       = PIC_CLK_HZ;
        s.serial_in     = nlm_xlr_uart_in;
        s.serial_out    = nlm_xlr_uart_out;
        s.mapbase       = uart_base;
@@ -163,7 +163,7 @@ static void prom_add_memory(void)
 {
        struct nlm_boot_mem_map *bootm;
        u64 start, size;
-       u64 pref_backup = 512;  /* avoid pref walking beyond end */
+       u64 pref_backup = 512;  /* avoid pref walking beyond end */
        int i;
 
        bootm = (void *)(long)nlm_prom_info.psb_mem_map;