From 672552adb3197c5db3acc8800c7917bcff180461 Mon Sep 17 00:00:00 2001
From: Steven Miao <realmz6@gmail.com>
Date: Wed, 16 May 2012 15:54:31 +0800
Subject: [PATCH] blackfin: fix build after add bf60x mach/pm.h

Signed-off-by: Steven Miao <realmz6@gmail.com>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
---
 arch/blackfin/include/asm/pm.h | 1 -
 arch/blackfin/kernel/setup.c   | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

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 @@
 #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 0053e1bc0c6a..ada8f0fc71e4 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);
-- 
GitLab