Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / i2c / busses / i2c-tegra.c

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index b402435e9259e155663ca939b9287e30b6601465..46b6500c5478e9d3f1eb952848ed2d47dbf52a8f 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -567,7 +567,7 @@ static int tegra_i2c_probe(struct platform_device *pdev)
        struct clk *clk;
        struct clk *i2c_clk;
        const unsigned int *prop;
-       void *base;
+       void __iomem *base;
        int irq;
        int ret = 0;