diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-18 01:23:34 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-18 01:23:34 +0100 |
| commit | c68cfdc0a5879b4397dcfa837ba81a06039c2943 (patch) | |
| tree | 1ed0119e430078094c0d15b0ffe686b7deb8a9ef /kernel/power/power.h | |
| parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
| parent | db597605821fccc49876705aea5db5443d67e53e (diff) | |
| download | lwn-c68cfdc0a5879b4397dcfa837ba81a06039c2943.tar.gz lwn-c68cfdc0a5879b4397dcfa837ba81a06039c2943.zip | |
Merge back 'pm-sleep' material for 3.19-rc1.
Diffstat (limited to 'kernel/power/power.h')
| -rw-r--r-- | kernel/power/power.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index 2df883a9d3cb..ce9b8328a689 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -174,8 +174,7 @@ extern int hib_wait_on_bio_chain(struct bio **bio_chain); struct timeval; /* kernel/power/swsusp.c */ -extern void swsusp_show_speed(struct timeval *, struct timeval *, - unsigned int, char *); +extern void swsusp_show_speed(ktime_t, ktime_t, unsigned int, char *); #ifdef CONFIG_SUSPEND /* kernel/power/suspend.c */ |