aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorSteven Miao <realmz6@gmail.com>2012-05-16 03:54:31 -0400
committerBob Liu <lliubbo@gmail.com>2012-05-21 02:55:07 -0400
commit672552adb3197c5db3acc8800c7917bcff180461 (patch)
treef9af12be327191b6fd71534d0ec27fd881630410 /arch/blackfin
parentbda45b8f344069179ca6ed1317fae6365134daef (diff)
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>
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 da63b46e0c6..f72239bf363 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 0053e1bc0c6..ada8f0fc71e 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);