diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:24:11 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:24:11 -0500 |
| commit | 91e013827c0bcbb187ecf02213c5446b6f62d445 (patch) | |
| tree | 52ad3d0db856c50ab3a1a56da2bf3ae6ed8a8f48 /drivers | |
| parent | 988addf82e4c03739375279de73929580a2d4a6a (diff) | |
| parent | 8d2b09f5b0de2c0e37f50d04980bc81098988239 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/maps/pismo.c | 2 |
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, | |||
| 118 | { | 118 | { |
| 119 | struct platform_device *dev; | 119 | struct platform_device *dev; |
| 120 | struct resource res = { }; | 120 | struct resource res = { }; |
| 121 | phys_addr_t base = region.base; | 121 | phys_addr_t base = region->base; |
| 122 | int ret; | 122 | int ret; |
| 123 | 123 | ||
| 124 | if (base == ~0) | 124 | if (base == ~0) |