ARM: mmp: avoid to include head file in mach-mmp
pxa910_set_wake() & mmp2_set_wake() are both declared in head files of arch/arm/mach-mmp/include/mach directory. If we include these head files in irq-mmp driver, it blocks the multiplatform build. So adjust the code. Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Tento commit je obsažen v:
@@ -13,6 +13,8 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/irqchip/mmp.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <asm/hardware/cache-tauros2.h>
|
||||
@@ -26,6 +28,7 @@
|
||||
#include <mach/mfp.h>
|
||||
#include <mach/devices.h>
|
||||
#include <mach/mmp2.h>
|
||||
#include <mach/pm-mmp2.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
@@ -94,6 +97,9 @@ void mmp2_clear_pmic_int(void)
|
||||
void __init mmp2_init_irq(void)
|
||||
{
|
||||
mmp2_init_icu();
|
||||
#ifdef CONFIG_PM
|
||||
icu_irq_chip.irq_set_wake = mmp2_set_wake;
|
||||
#endif
|
||||
}
|
||||
|
||||
static int __init mmp2_init(void)
|
||||
|
@@ -12,6 +12,8 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/irqchip/mmp.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <asm/hardware/cache-tauros2.h>
|
||||
@@ -23,6 +25,7 @@
|
||||
#include <mach/dma.h>
|
||||
#include <mach/mfp.h>
|
||||
#include <mach/devices.h>
|
||||
#include <mach/pm-pxa910.h>
|
||||
#include <mach/pxa910.h>
|
||||
|
||||
#include "common.h"
|
||||
@@ -80,6 +83,9 @@ static struct mfp_addr_map pxa910_mfp_addr_map[] __initdata =
|
||||
void __init pxa910_init_irq(void)
|
||||
{
|
||||
icu_init_irq();
|
||||
#ifdef CONFIG_PM
|
||||
icu_irq_chip.irq_set_wake = pxa910_set_wake;
|
||||
#endif
|
||||
}
|
||||
|
||||
static int __init pxa910_init(void)
|
||||
|
Odkázat v novém úkolu
Zablokovat Uživatele