diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 15:39:24 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 15:39:24 +0200 |
| commit | 0ee8090c1d059eca4d60e8e473bee91fb5d1996b (patch) | |
| tree | 4112e5f7637d1323c81db048c7d49dbf6ad09d29 /arch/arm | |
| parent | 5455ae4157ea4c0dc80a700990bba882d1891e0d (diff) | |
| parent | 77979bd7b514680a7c9c6efcb01e0b535985e36e (diff) | |
| download | linux-0ee8090c1d059eca4d60e8e473bee91fb5d1996b.tar.gz linux-0ee8090c1d059eca4d60e8e473bee91fb5d1996b.tar.bz2 linux-0ee8090c1d059eca4d60e8e473bee91fb5d1996b.zip | |
Merge branch 'armsoc/for-3.11/cleanups' of git://github.com/broadcom/bcm11351 into next/cleanup
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 <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-bcm/board_bcm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c index 22e8421b1df3..28599326d4ad 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, |