Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux...

[pandora-kernel.git] / arch / arm / plat-orion / common.c

diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 87f53ca..b8a688c 100644 (file)
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -86,13 +86,13 @@ static void __init uart_complete(
        struct platform_device *orion_uart,
        struct plat_serial8250_port *data,
        struct resource *resources,
-       unsigned int membase,
+       void __iomem *membase,
        resource_size_t mapbase,
        unsigned int irq,
        struct clk *clk)
 {
        data->mapbase = mapbase;
-       data->membase = (void __iomem *)membase;
+       data->membase = membase;
        data->irq = irq;
        data->uartclk = uart_get_clk_rate(clk);
        orion_uart->dev.platform_data = data;
@@ -120,7 +120,7 @@ static struct platform_device orion_uart0 = {
        .id                     = PLAT8250_DEV_PLATFORM,
 };
 
-void __init orion_uart0_init(unsigned int membase,
+void __init orion_uart0_init(void __iomem *membase,
                             resource_size_t mapbase,
                             unsigned int irq,
                             struct clk *clk)
@@ -148,7 +148,7 @@ static struct platform_device orion_uart1 = {
        .id                     = PLAT8250_DEV_PLATFORM1,
 };
 
-void __init orion_uart1_init(unsigned int membase,
+void __init orion_uart1_init(void __iomem *membase,
                             resource_size_t mapbase,
                             unsigned int irq,
                             struct clk *clk)
@@ -176,7 +176,7 @@ static struct platform_device orion_uart2 = {
        .id                     = PLAT8250_DEV_PLATFORM2,
 };
 
-void __init orion_uart2_init(unsigned int membase,
+void __init orion_uart2_init(void __iomem *membase,
                             resource_size_t mapbase,
                             unsigned int irq,
                             struct clk *clk)
@@ -204,7 +204,7 @@ static struct platform_device orion_uart3 = {
        .id                     = 3,
 };
 
-void __init orion_uart3_init(unsigned int membase,
+void __init orion_uart3_init(void __iomem *membase,
                             resource_size_t mapbase,
                             unsigned int irq,
                             struct clk *clk)