diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 17:46:04 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 17:46:04 +0200 |
commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
tree | e8006368b6f643067486f92405a404757807d6da /drivers/mtd/maps | |
parent | [MTD] NAND: nandsim: support subpage write (diff) | |
parent | [PATCH] fix PXA2xx UDC compilation error (diff) | |
download | linux-513b046c96cc2fbce730a3474f6f7ff0c4fdd05c.tar.xz linux-513b046c96cc2fbce730a3474f6f7ff0c4fdd05c.zip |
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) } if (info->map.virt != NULL) - iounmap((void *)info->map.virt); + iounmap(info->map.virt); if (info->res != NULL) { release_resource(info->res); |