From b1f19d06e80c0895ee7f74f2be63be48b4b8b495 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Mon, 20 Aug 2012 13:46:51 +0800 Subject: [PATCH] --- yaml --- r: 326712 b: refs/heads/master c: e6c509c8ef85155bf504254399d758384a3b2e38 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/pxa3xx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index faf49f2f2201..a1ec01f90c03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e308f87c821e5b9316d9eb69e96d8a33910412a +refs/heads/master: e6c509c8ef85155bf504254399d758384a3b2e38 diff --git a/trunk/arch/arm/mach-pxa/pxa3xx.c b/trunk/arch/arm/mach-pxa/pxa3xx.c index 4a9d04a57de5..ff9c9574ec3e 100644 --- a/trunk/arch/arm/mach-pxa/pxa3xx.c +++ b/trunk/arch/arm/mach-pxa/pxa3xx.c @@ -402,11 +402,13 @@ void __init pxa3xx_init_irq(void) pxa_init_irq(56, pxa3xx_set_wake); } +#ifdef CONFIG_OF void __init pxa3xx_dt_init_irq(void) { __pxa3xx_init_irq(); pxa_dt_irq_init(pxa3xx_set_wake); } +#endif /* CONFIG_OF */ static struct map_desc pxa3xx_io_desc[] __initdata = { { /* Mem Ctl */