Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually

[linux-2.6-omap-h63xx.git] / arch / ppc / platforms / 4xx / bamboo.h

diff --git a/arch/ppc/platforms/4xx/bamboo.h b/arch/ppc/platforms/4xx/bamboo.h
index 63d7145041486f1a8206d8aafe57899cb26d4857..5c01928264941ad0a227c38e693a4facd7d4cfe8 100644 (file)
--- a/arch/ppc/platforms/4xx/bamboo.h
+++ b/arch/ppc/platforms/4xx/bamboo.h
@@ -88,7 +88,7 @@
 #define STD_UART_OP(num)                                       \
        { 0, BASE_BAUD, 0, UART##num##_INT,                     \
                (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST),        \
-               iomem_base: UART##num##_IO_BASE,                \
+               iomem_base: (void*)UART##num##_IO_BASE,         \
                io_type: SERIAL_IO_MEM},
 
 #define SERIAL_PORT_DFNS       \