linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ppc / platforms / spruce.c

diff --git a/arch/ppc/platforms/spruce.c b/arch/ppc/platforms/spruce.c
index ad67102..69e1de7 100644 (file)
--- a/arch/ppc/platforms/spruce.c
+++ b/arch/ppc/platforms/spruce.c
@@ -176,8 +176,8 @@ spruce_early_serial_map(void)
        memset(&serial_req, 0, sizeof(serial_req));
        serial_req.uartclk = uart_clk;
        serial_req.irq = UART0_INT;
-       serial_req.flags = ASYNC_BOOT_AUTOCONF;
-       serial_req.iotype = SERIAL_IO_MEM;
+       serial_req.flags = UPF_BOOT_AUTOCONF;
+       serial_req.iotype = UPIO_MEM;
        serial_req.membase = (u_char *)UART0_IO_BASE;
        serial_req.regshift = 0;
 
@@ -228,11 +228,6 @@ spruce_setup_arch(void)
                ROOT_DEV = Root_SDA1;
 #endif
 
-#ifdef CONFIG_VT
-       conswitchp = &dummy_con;
-#endif
-
-
        /* Identify the system */
        printk(KERN_INFO "System Identification: IBM Spruce\n");
        printk(KERN_INFO "Port by MontaVista Software, Inc. (source@mvista.com)\n");
@@ -283,8 +278,8 @@ static __inline__ void
 spruce_set_bat(void)
 {
        mb();
-       mtspr(DBAT1U, 0xf8000ffe);
-       mtspr(DBAT1L, 0xf800002a);
+       mtspr(SPRN_DBAT1U, 0xf8000ffe);
+       mtspr(SPRN_DBAT1L, 0xf800002a);
        mb();
 }