diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-03-26 10:55:59 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-03-26 10:55:59 -0400 |
| commit | 329f9052dbadf6f4afe2231668bd00c579a4aa10 (patch) | |
| tree | e080a5c70df40f3ae8cf28a95a3267757668ab97 /drivers/mtd/maps/pismo.c | |
| parent | 395b228858778d3c44f7c413693a6acaa8bb62dc (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/nand/sh_flctl.c
Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().
Diffstat (limited to 'drivers/mtd/maps/pismo.c')
| -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 0a5e243d2bc6..f021018e0741 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) |