From ad72e228566f0fc1b4e63d5ba63d1029bcff1939 Mon Sep 17 00:00:00 2001 From: Russell King - ARM Linux Date: Fri, 20 Jan 2012 10:42:16 +0000 Subject: [PATCH] --- yaml --- r: 298085 b: refs/heads/master c: 41515ca262d5b75220f48afd21214dbe3ccfef8c h: refs/heads/master i: 298083: 7b7569791bd041e278f7e0d81db7083c8081765a v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/sa1100-flash.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 33cbf26d3a7e..56210b2e172f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 495c47d799d93ad688db9db170200eb71525ff45 +refs/heads/master: 41515ca262d5b75220f48afd21214dbe3ccfef8c diff --git a/trunk/drivers/mtd/maps/sa1100-flash.c b/trunk/drivers/mtd/maps/sa1100-flash.c index 502821997707..c7355692ea85 100644 --- a/trunk/drivers/mtd/maps/sa1100-flash.c +++ b/trunk/drivers/mtd/maps/sa1100-flash.c @@ -373,21 +373,9 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static void sa1100_mtd_shutdown(struct platform_device *dev) -{ - struct sa_info *info = platform_get_drvdata(dev); - if (info && mtd_suspend(info->mtd) == 0) - mtd_resume(info->mtd); -} -#else -#define sa1100_mtd_shutdown NULL -#endif - static struct platform_driver sa1100_mtd_driver = { .probe = sa1100_mtd_probe, .remove = __exit_p(sa1100_mtd_remove), - .shutdown = sa1100_mtd_shutdown, .driver = { .name = "sa1100-mtd", .owner = THIS_MODULE,