summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-08 21:24:11 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-08 21:24:11 +0100
commit91e013827c0bcbb187ecf02213c5446b6f62d445 (patch)
tree52ad3d0db856c50ab3a1a56da2bf3ae6ed8a8f48 /drivers
parentMerge branch 'origin' into devel-stable (diff)
parentARM: 5961/1: ux500: fix CLKRST addresses (diff)
downloadlinux-91e013827c0bcbb187ecf02213c5446b6f62d445.tar.xz
linux-91e013827c0bcbb187ecf02213c5446b6f62d445.zip
Merge branch 'master' into for-linus
Diffstat (limited to '')
-rw-r--r--drivers/mtd/maps/pismo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
index c48cad271f5d..30e12c88d1da 100644
--- 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)