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>

diff --git a/arch/blackfin/include/asm/pm.h b/arch/blackfin/include/asm/pm.h
index da63b46e0c68f1a63d44774bf0fad8095c364224..f72239bf3638c813d79d806b37c221deeff6cea3 100644 (file)
--- 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 0053e1bc0c6abc1d232afa2f50e8a7efcb01ad4a..ada8f0fc71e4731fc9bb619aacc7a77df50d7d54 100644 (file)
--- 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);