diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /drivers/mtd/maps | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/maps')
| -rw-r--r-- | drivers/mtd/maps/physmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index bc7cc71788bc..d1717763f719 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c | |||
| @@ -62,7 +62,7 @@ static int physmap_flash_remove(struct platform_device *dev) | |||
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | if (info->map.virt != NULL) | 64 | if (info->map.virt != NULL) |
| 65 | iounmap((void *)info->map.virt); | 65 | iounmap(info->map.virt); |
| 66 | 66 | ||
| 67 | if (info->res != NULL) { | 67 | if (info->res != NULL) { |
| 68 | release_resource(info->res); | 68 | release_resource(info->res); |