Skip to content

Commit

Permalink
Merge branch 'armsoc/for-3.11/cleanups' of git://github.com/broadcom/…
Browse files Browse the repository at this point in the history
…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 <[email protected]>
  • Loading branch information
arndb committed Jun 21, 2013
2 parents 5455ae4 + 77979bd commit 0ee8090
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/arm/mach-bcm/board_bcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 0ee8090

Please sign in to comment.