Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / arch / unicore32 / include / asm / suspend.h

diff --git a/arch/unicore32/include/asm/suspend.h b/arch/unicore32/include/asm/suspend.h
index 88a9c0f32b219677e38eb1eb6b817861ec8edc37..65bad75c7e96d0706f51bb16fcdcb9615e86b435 100644 (file)
--- a/arch/unicore32/include/asm/suspend.h
+++ b/arch/unicore32/include/asm/suspend.h
@@ -14,7 +14,6 @@
 #define __UNICORE_SUSPEND_H__
 
 #ifndef __ASSEMBLY__
-static inline int arch_prepare_suspend(void) { return 0; }
 
 #include <asm/ptrace.h>