Merge branch 'armsoc/for-3.11/cleanups' of git://github.com/broadcom/bcm11351 into next/cleanup

0ee8090c · Arnd Bergmann <[email protected]> · 2013-06-21 15:39:24 +02:00

From Christian Daudt:

* 'armsoc/for-3.11/cleanups' of git://github.com/broadcom/bcm11351:
  ARM: bcm281xx: Remove init_irq declaration in machine description

Signed-off-by: Arnd Bergmann <[email protected]>

Commit: 0ee8090c1d059eca4d60e8e473bee91fb5d1996b
Parents: 5455ae41 · 77979bd7

Merge commit. Changes below are compared with the first parent: 5455ae41.

Changes

1 files changed · +0 −2

File	Status	Add	Del	Content
arch/arm/mach-bcm/board_bcm.c	modified	+0	−2	View file

arch/arm/mach-bcm/board_bcm.c

View file

diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
index 22e8421..2859932 100644
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm.c
@@ -15,7 +15,6 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
-#include <linux/irqchip.h>
 #include <linux/clocksource.h>
 
 #include <asm/mach/arch.h>
@@ -54,7 +53,6 @@ static void __init board_init(void)
 static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
 
 DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
-	.init_irq = irqchip_init,
 	.init_time = clocksource_of_init,
 	.init_machine = board_init,
 	.dt_compat = bcm11351_dt_compat,