Merge branch 'master' into upstream-fixes

[linux-2.6-omap-h63xx.git] / arch / frv / kernel / pm.c

diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index 43ce28a13a5d8f3cf904f7331809af2cc6763409..c1d9fc8f1a859f8d365abbcfc6efc2949bf2e092 100644 (file)
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -11,7 +11,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pm.h>
@@ -27,11 +26,6 @@
 
 #include "local.h"
 
-void (*pm_power_off)(void);
-EXPORT_SYMBOL(pm_power_off);
-
-extern void frv_change_cmode(int);
-
 /*
  * Debug macros
  */