diff --git a/[refs] b/[refs] index 5b88cc289fc5..efdaabef61ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98e12b5a6e05413420a7e3b3eca7fbfc2ff41b6d +refs/heads/master: 1d40ddd10dab332456e3863fed2a6e71aa6635ab diff --git a/trunk/drivers/mtd/maps/pismo.c b/trunk/drivers/mtd/maps/pismo.c index c48cad271f5d..30e12c88d1da 100644 --- a/trunk/drivers/mtd/maps/pismo.c +++ b/trunk/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)