summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
Diffstat (limited to 'arch/blackfin')
-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 da63b46..f72239b 100644
--- a/arch/blackfin/include/asm/pm.h
+++ b/arch/blackfin/include/asm/pm.h
@@ -9,7 +9,6 @@
#ifndef __PM_H__
#define __PM_H__
-#include <mach/pm.h>
#include <linux/suspend.h>
struct bfin_cpu_pm_fns {
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 0053e1b..ada8f0f 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -32,6 +32,9 @@
#include <asm/early_printk.h>
#include <asm/irq_handler.h>
#include <asm/pda.h>
+#ifdef CONFIG_BF60x
+#include <mach/pm.h>
+#endif
u16 _bfin_swrst;
EXPORT_SYMBOL(_bfin_swrst);
OpenPOWER on IntegriCloud