commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=ff48c8580bc66a74a0e0121acd43a18e3074cc0e branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Steven Miao <[email protected]> --- arch/blackfin/include/asm/icc.h | 1 + arch/blackfin/include/asm/pm.h | 1 - arch/blackfin/kernel/setup.c | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/blackfin/include/asm/icc.h b/arch/blackfin/include/asm/icc.h index 7576bb2..b9c9fd2 100644 --- a/arch/blackfin/include/asm/icc.h +++ b/arch/blackfin/include/asm/icc.h @@ -7,6 +7,7 @@ #ifndef _BFIN_ICC_H #define _BFIN_ICC_H +#include <linux/cpumask.h> #include <mach/icc.h> void platform_request_ipi(int irq, void *handler); 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 a4a4b2f..5cf7dee 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c @@ -33,6 +33,9 @@ #include <asm/irq_handler.h> #include <asm/pda.h> #include <asm/pm.h> +#ifdef CONFIG_BF60x +#include <mach/pm.h> +#endif u16 _bfin_swrst; EXPORT_SYMBOL(_bfin_swrst); @@ -206,7 +209,7 @@ void __init bfin_relocate_l1_mem(void) blackfin_dma_early_init(); -#ifdef CONFIG_BFIN_COREB +#if defined(CONFIG_BFIN_COREB) && defined(CONFIG_BF60x) coreb_enable(); if (L1_CODE_LENGTH && text_l1_len)
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
