From 3ae5fe1ca46a2d24c0cf3e38f91ece64448f7353 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 18 Dec 2011 11:33:59 +0000
Subject: [PATCH] --- yaml --- r: 295346 b: refs/heads/master c:
 4ce02fdc4e20210d3bb042910257689d0a5afb9a h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-ux500/devices-common.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ccd24513a667..003ba4010939 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 023f117c547719fbc087ad72276aec5a026370df
+refs/heads/master: 4ce02fdc4e20210d3bb042910257689d0a5afb9a
diff --git a/trunk/arch/arm/mach-ux500/devices-common.c b/trunk/arch/arm/mach-ux500/devices-common.c
index e8c34fabc3c7..898a64517b09 100644
--- a/trunk/arch/arm/mach-ux500/devices-common.c
+++ b/trunk/arch/arm/mach-ux500/devices-common.c
@@ -34,7 +34,6 @@ dbx500_add_amba_device(const char *name, resource_size_t base,
 	dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 
 	dev->irq[0] = irq;
-	dev->irq[1] = NO_IRQ;
 
 	dev->periphid = periphid;