diff --git a/[refs] b/[refs] index 840ceba932bc..62de2b877369 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 259130526c267550bc365d3015917d90667732f1 +refs/heads/master: d12c610e08022a1b84d6bd4412c189214d32e713 diff --git a/trunk/kernel/power/user.c b/trunk/kernel/power/user.c index 4f217683455f..b70d83d6b16e 100644 --- a/trunk/kernel/power/user.c +++ b/trunk/kernel/power/user.c @@ -122,7 +122,7 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf, return res; } -static inline int snapshot_suspend(void) +static int snapshot_suspend(void) { int error; @@ -151,7 +151,7 @@ static inline int snapshot_suspend(void) return error; } -static inline int snapshot_restore(void) +static int snapshot_restore(void) { int error;