aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/blackfin/include/asm/pm.h1
-rw-r--r--arch/blackfin/kernel/setup.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/pm.h b/arch/blackfin/include/asm/pm.h
index da63b46e0c68..f72239bf3638 100644
--- a/arch/blackfin/include/asm/pm.h
+++ b/arch/blackfin/include/asm/pm.h
@@ -9,7 +9,6 @@
9#ifndef __PM_H__ 9#ifndef __PM_H__
10#define __PM_H__ 10#define __PM_H__
11 11
12#include <mach/pm.h>
13#include <linux/suspend.h> 12#include <linux/suspend.h>
14 13
15struct bfin_cpu_pm_fns { 14struct bfin_cpu_pm_fns {
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 0053e1bc0c6a..ada8f0fc71e4 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -32,6 +32,9 @@
32#include <asm/early_printk.h> 32#include <asm/early_printk.h>
33#include <asm/irq_handler.h> 33#include <asm/irq_handler.h>
34#include <asm/pda.h> 34#include <asm/pda.h>
35#ifdef CONFIG_BF60x
36#include <mach/pm.h>
37#endif
35 38
36u16 _bfin_swrst; 39u16 _bfin_swrst;
37EXPORT_SYMBOL(_bfin_swrst); 40EXPORT_SYMBOL(_bfin_swrst);