From d1304ea1d94548d217cf39e76100ea72d061001b Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Tue, 26 Aug 2008 16:04:05 +0200
Subject: [PATCH] --- yaml --- r: 112503 b: refs/heads/master c:
 144f814a439ff0b8ad62c51d74e56b490e651ded h: refs/heads/master i:   112501:
 7489cb1211734f879d53115f782d9970118886d1   112499:
 6711eac6a462aad072e5418a9ace96d2ce57a23e   112495:
 7947f766360abc233e1e767b1dbb73acacadf012 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/arm/mach-kirkwood/common.c            | 7 ++++++-
 trunk/arch/arm/mach-kirkwood/include/mach/irqs.h | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a66ba70de02f..d482a4bc2473 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeff6d8600afa69fa06ef69a6ffe427b1189cef4
+refs/heads/master: 144f814a439ff0b8ad62c51d74e56b490e651ded
diff --git a/trunk/arch/arm/mach-kirkwood/common.c b/trunk/arch/arm/mach-kirkwood/common.c
index 189f16f3619d..435fb35a4845 100644
--- a/trunk/arch/arm/mach-kirkwood/common.c
+++ b/trunk/arch/arm/mach-kirkwood/common.c
@@ -108,6 +108,11 @@ static struct resource kirkwood_ge00_shared_resources[] = {
 		.start	= GE00_PHYS_BASE + 0x2000,
 		.end	= GE00_PHYS_BASE + 0x3fff,
 		.flags	= IORESOURCE_MEM,
+	}, {
+		.name	= "ge00 err irq",
+		.start	= IRQ_KIRKWOOD_GE00_ERR,
+		.end	= IRQ_KIRKWOOD_GE00_ERR,
+		.flags	= IORESOURCE_IRQ,
 	},
 };
 
@@ -117,7 +122,7 @@ static struct platform_device kirkwood_ge00_shared = {
 	.dev		= {
 		.platform_data	= &kirkwood_ge00_shared_data,
 	},
-	.num_resources	= 1,
+	.num_resources	= ARRAY_SIZE(kirkwood_ge00_shared_resources),
 	.resource	= kirkwood_ge00_shared_resources,
 };
 
diff --git a/trunk/arch/arm/mach-kirkwood/include/mach/irqs.h b/trunk/arch/arm/mach-kirkwood/include/mach/irqs.h
index 6fd05838c72d..ffab89f21c11 100644
--- a/trunk/arch/arm/mach-kirkwood/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-kirkwood/include/mach/irqs.h
@@ -50,6 +50,7 @@
 #define IRQ_KIRKWOOD_GPIO_HIGH_0_7	39
 #define IRQ_KIRKWOOD_GPIO_HIGH_8_15	40
 #define IRQ_KIRKWOOD_GPIO_HIGH_16_23	41
+#define IRQ_KIRKWOOD_GE00_ERR	46
 
 /*
  * KIRKWOOD General Purpose Pins