1 files changed, 0 insertions, 21 deletions

diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
index 214d123b79fa..d118b9aa7647 100644
--- a/arch/mips/netlogic/xlr/setup.c
+++ b/arch/mips/netlogic/xlr/setup.c
@@ -60,25 +60,6 @@ unsigned int  nlm_threads_per_core = 1;
 struct nlm_soc_info nlm_nodes[NLM_NR_NODES];
 cpumask_t nlm_cpumask = CPU_MASK_CPU0;
 
-static void __init nlm_early_serial_setup(void)
-{
-        struct uart_port s;
-        unsigned long uart_base;
-
-        uart_base = (unsigned long)nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET);
-        memset(&s, 0, sizeof(s));
-        s.flags         = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
-        s.iotype        = UPIO_MEM32;
-        s.regshift      = 2;
-        s.irq           = PIC_UART_0_IRQ;
-        s.uartclk       = PIC_CLK_HZ;
-        s.serial_in     = nlm_xlr_uart_in;
-        s.serial_out    = nlm_xlr_uart_out;
-        s.mapbase       = uart_base;
-        s.membase       = (unsigned char __iomem *)uart_base;
-        early_serial_setup(&s);
-}
-
 static void nlm_linux_exit(void)
 {
         uint64_t gpiobase;
@@ -92,7 +73,6 @@ static void nlm_linux_exit(void)
 
 void __init plat_mem_setup(void)
 {
-        panic_timeout   = 5;
         _machine_restart = (void (*)(char *))nlm_linux_exit;
         _machine_halt   = nlm_linux_exit;
         pm_power_off    = nlm_linux_exit;
@@ -215,7 +195,6 @@ void __init prom_init(void)
         memcpy(reset_vec, (void *)nlm_reset_entry,
                         (nlm_reset_entry_end - nlm_reset_entry));
 
-        nlm_early_serial_setup();
         build_arcs_cmdline(argv);
         prom_add_memory();