From dcf44a1659c4b3fe96a2cb124654b7c373627164 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Thu, 1 Dec 2011 11:16:46 +0100
Subject: [PATCH] --- yaml --- r: 279912 b: refs/heads/master c:
 ad622671a4da0b6db1c1382e6345e1361c5fbab8 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/common/vic.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ed34414db52a..d14937dcd7dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d
+refs/heads/master: ad622671a4da0b6db1c1382e6345e1361c5fbab8
diff --git a/trunk/arch/arm/common/vic.c b/trunk/arch/arm/common/vic.c
index 6ed41ec2bbf5..77287504c8b4 100644
--- a/trunk/arch/arm/common/vic.c
+++ b/trunk/arch/arm/common/vic.c
@@ -318,7 +318,7 @@ static void __init vic_set_irq_sources(void __iomem *base,
  *  and 020 within the page. We call this "second block".
  */
 static void __init vic_init_st(void __iomem *base, unsigned int irq_start,
-				u32 vic_sources)
+			       u32 vic_sources, struct device_node *node)
 {
 	unsigned int i;
 	int vic_2nd_block = ((unsigned long)base & ~PAGE_MASK) != 0;
@@ -345,6 +345,7 @@ static void __init vic_init_st(void __iomem *base, unsigned int irq_start,
 	}
 
 	vic_set_irq_sources(base, irq_start, vic_sources);
+	vic_register(base, irq_start, 0, node);
 }
 
 static void __init __vic_init(void __iomem *base, unsigned int irq_start,
@@ -367,7 +368,7 @@ static void __init __vic_init(void __iomem *base, unsigned int irq_start,
 
 	switch(vendor) {
 	case AMBA_VENDOR_ST:
-		vic_init_st(base, irq_start, vic_sources);
+		vic_init_st(base, irq_start, vic_sources, node);
 		return;
 	default:
 		printk(KERN_WARNING "VIC: unknown vendor, continuing anyways\n");