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>
2012-05-16 15:54:31 +08:00 · 2012-05-16 15:54:31 +08:00 · 672552adb3
parent bda45b8f34
commit 672552adb3
2 changed files with 3 additions and 1 deletions
--- 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 {
--- 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);