Commit 0ee8090c authored by Arnd Bergmann's avatar Arnd Bergmann

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 5455ae41 77979bd7
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/irqchip.h>
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
...@@ -54,7 +53,6 @@ static void __init board_init(void) ...@@ -54,7 +53,6 @@ static void __init board_init(void)
static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, }; static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
.init_irq = irqchip_init,
.init_time = clocksource_of_init, .init_time = clocksource_of_init,
.init_machine = board_init, .init_machine = board_init,
.dt_compat = bcm11351_dt_compat, .dt_compat = bcm11351_dt_compat,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment