projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.10/drivers' of git://git.kernel.dk/linux-block
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
block
/
mg_disk.c
diff --git
a/drivers/block/mg_disk.c
b/drivers/block/mg_disk.c
index
076ae7f
..
a56cfcd
100644
(file)
--- a/
drivers/block/mg_disk.c
+++ b/
drivers/block/mg_disk.c
@@
-780,6
+780,7
@@
static const struct block_device_operations mg_disk_ops = {
.getgeo = mg_getgeo
};
+#ifdef CONFIG_PM_SLEEP
static int mg_suspend(struct device *dev)
{
struct mg_drv_data *prv_data = dev->platform_data;
@@
-824,6
+825,7
@@
static int mg_resume(struct device *dev)
return 0;
}
+#endif
static SIMPLE_DEV_PM_OPS(mg_pm, mg_suspend, mg_resume);