Commit 96f95ab8 authored by William Lee Irwin III's avatar William Lee Irwin III Committed by Greg Kroah-Hartman

[PATCH] fix duplicate decls in swsusp

Remove the reboot.h declaration of swsusp functions that clash
with the no-op inline.
parent 10b15f15
...@@ -48,13 +48,6 @@ extern void machine_restart(char *cmd); ...@@ -48,13 +48,6 @@ extern void machine_restart(char *cmd);
extern void machine_halt(void); extern void machine_halt(void);
extern void machine_power_off(void); extern void machine_power_off(void);
/*
* Architecture-independent suspend facility
*/
extern void software_suspend(void);
extern unsigned char software_suspend_enabled;
#endif #endif
#endif /* _LINUX_REBOOT_H */ #endif /* _LINUX_REBOOT_H */
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/times.h> #include <linux/times.h>
#include <linux/security.h> #include <linux/security.h>
#include <linux/dcookies.h> #include <linux/dcookies.h>
#include <linux/suspend.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment