aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorGravatar Rafael J. Wysocki <rafael.j.wysocki@intel.com> 2017-10-09 14:20:07 +0200
committerGravatar Rafael J. Wysocki <rafael.j.wysocki@intel.com> 2017-10-09 14:20:07 +0200
commita5950f2617f71a3dce16520c4907bcdb31e654ba (patch)
tree9e56b5eb5119737538a4763ec74a4271e5788a00 /arch/arm/include/asm
parentPM / s2idle: Invoke the ->wake() platform callback earlier (diff)
parentPM: ARM: locomo: Drop suspend and resume bus type callbacks (diff)
downloadlinux-a5950f2617f71a3dce16520c4907bcdb31e654ba.tar.gz
linux-a5950f2617f71a3dce16520c4907bcdb31e654ba.tar.bz2
linux-a5950f2617f71a3dce16520c4907bcdb31e654ba.zip
Merge back suspend/resume/hibernate material for v4.15.
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/hardware/locomo.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/hardware/locomo.h b/arch/arm/include/asm/hardware/locomo.h
index 74e51d6bd93f..f8712e3c29cf 100644
--- a/arch/arm/include/asm/hardware/locomo.h
+++ b/arch/arm/include/asm/hardware/locomo.h
@@ -189,8 +189,6 @@ struct locomo_driver {
unsigned int devid;
int (*probe)(struct locomo_dev *);
int (*remove)(struct locomo_dev *);
- int (*suspend)(struct locomo_dev *, pm_message_t);
- int (*resume)(struct locomo_dev *);
};
#define LOCOMO_DRV(_d) container_of((_d), struct locomo_driver, drv)