Merge branch 'v2.6.34-rc2' into drm-linus

[cascardo/linux.git] / drivers / mtd / maps / pismo.c

diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
index c48cad2..30e12c8 100644 (file)
--- a/drivers/mtd/maps/pismo.c
+++ b/drivers/mtd/maps/pismo.c
@@ -118,7 +118,7 @@ static int __devinit pismo_add_device(struct pismo_data *pismo, int i,
 {
        struct platform_device *dev;
        struct resource res = { };
-       phys_addr_t base = region.base;
+       phys_addr_t base = region->base;
        int ret;
 
        if (base == ~0)