diff options
| author | James Morris <jmorris@namei.org> | 2008-11-06 00:12:34 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-06 00:12:34 +0100 |
| commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
| tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /kernel/power/power.h | |
| parent | selinux: recognize netlink messages for 'ip addrlabel' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-e21e696edb498c7f7eed42ba3096f6bbe13927b6.tar.xz linux-e21e696edb498c7f7eed42ba3096f6bbe13927b6.zip | |
Merge branch 'master' into next
Diffstat (limited to 'kernel/power/power.h')
| -rw-r--r-- | kernel/power/power.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index acc0c101dbd5..46b5ec7a3afb 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -153,7 +153,7 @@ extern int swsusp_shrink_memory(void); extern void swsusp_free(void); extern int swsusp_read(unsigned int *flags_p); extern int swsusp_write(unsigned int flags); -extern void swsusp_close(void); +extern void swsusp_close(fmode_t); struct timeval; /* kernel/power/swsusp.c */ |