diff options
| author | akpm@linux-foundation.org <akpm@linux-foundation.org> | 2008-02-03 12:56:03 -0800 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-07 10:33:40 +0000 |
| commit | d5476689afd48e71395602698409e9f48cbba413 (patch) | |
| tree | 2808a4825fee6b1f60d921b623baeee05c983165 /drivers/mtd/maps | |
| parent | 6c77fd649fab4bea1b44cb534381a22e37650bc3 (diff) | |
| download | blackbird-op-linux-d5476689afd48e71395602698409e9f48cbba413.tar.gz blackbird-op-linux-d5476689afd48e71395602698409e9f48cbba413.zip | |
[MTD] Fix maps/physmap.c compilation with CONFIG_PM
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd/maps')
| -rw-r--r-- | drivers/mtd/maps/physmap.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 5a83ae7e14f9..f00e04efbe28 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c @@ -204,7 +204,7 @@ static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state if (info) for (i = 0; i < MAX_RESOURCES; i++) - ret |= info->mtd[i].suspend(info->mtd[i]); + ret |= info->mtd[i]->suspend(info->mtd[i]); return ret; } @@ -216,7 +216,7 @@ static int physmap_flash_resume(struct platform_device *dev) if (info) for (i = 0; i < MAX_RESOURCES; i++) - info->mtd[i].resume(info->mtd[i]); + info->mtd[i]->resume(info->mtd[i]); return 0; } @@ -226,19 +226,21 @@ static void physmap_flash_shutdown(struct platform_device *dev) int i; for (i = 0; i < MAX_RESOURCES; i++) - if (info && info->mtd[i].suspend(info->mtd[i]) == 0) - info->mtd[i].resume(info->mtd[i]); + if (info && info->mtd[i]->suspend(info->mtd[i]) == 0) + info->mtd[i]->resume(info->mtd[i]); } +#else +#define physmap_flash_suspend NULL +#define physmap_flash_resume NULL +#define physmap_flash_shutdown NULL #endif static struct platform_driver physmap_flash_driver = { .probe = physmap_flash_probe, .remove = physmap_flash_remove, -#ifdef CONFIG_PM .suspend = physmap_flash_suspend, .resume = physmap_flash_resume, .shutdown = physmap_flash_shutdown, -#endif .driver = { .name = "physmap-flash", }, |
