From 1d530e8dbbe6c2b98a744665de450377faa5e44f Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Mon, 27 Feb 2012 10:37:02 +0800
Subject: [PATCH] --- yaml --- r: 295891 b: refs/heads/master c:
 93413c36d05573262aa5fd4da2f0f9ca90f39b75 h: refs/heads/master i:   295889:
 3e59ba557fcb5197695d4f8fd43524d5ee6fb9b9   295887:
 e93522b2150d55d47b16da7d96de868bd91cf207 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-mmp/mmp2.c   | 1 +
 trunk/arch/arm/mach-mmp/pxa168.c | 1 +
 trunk/arch/arm/mach-mmp/pxa910.c | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 77b0d2ed8f3b..a23ac0bdff70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a01ec304dbe167fb1d2efd85fcb2628b7aaba00
+refs/heads/master: 93413c36d05573262aa5fd4da2f0f9ca90f39b75
diff --git a/trunk/arch/arm/mach-mmp/mmp2.c b/trunk/arch/arm/mach-mmp/mmp2.c
index 617c60a170a4..c709a24a9d25 100644
--- a/trunk/arch/arm/mach-mmp/mmp2.c
+++ b/trunk/arch/arm/mach-mmp/mmp2.c
@@ -223,6 +223,7 @@ struct resource mmp2_resource_gpio[] = {
 	}, {
 		.start	= IRQ_MMP2_GPIO,
 		.end	= IRQ_MMP2_GPIO,
+		.name	= "gpio_mux",
 		.flags	= IORESOURCE_IRQ,
 	},
 };
diff --git a/trunk/arch/arm/mach-mmp/pxa168.c b/trunk/arch/arm/mach-mmp/pxa168.c
index 7bc17eaa12eb..9f612565b140 100644
--- a/trunk/arch/arm/mach-mmp/pxa168.c
+++ b/trunk/arch/arm/mach-mmp/pxa168.c
@@ -167,6 +167,7 @@ struct resource pxa168_resource_gpio[] = {
 	}, {
 		.start	= IRQ_PXA168_GPIOX,
 		.end	= IRQ_PXA168_GPIOX,
+		.name	= "gpio_mux",
 		.flags	= IORESOURCE_IRQ,
 	},
 };
diff --git a/trunk/arch/arm/mach-mmp/pxa910.c b/trunk/arch/arm/mach-mmp/pxa910.c
index 3241a25784d0..0c87e69adf9f 100644
--- a/trunk/arch/arm/mach-mmp/pxa910.c
+++ b/trunk/arch/arm/mach-mmp/pxa910.c
@@ -173,6 +173,7 @@ struct resource pxa910_resource_gpio[] = {
 	}, {
 		.start	= IRQ_PXA910_AP_GPIO,
 		.end	= IRQ_PXA910_AP_GPIO,
+		.name	= "gpio_mux",
 		.flags	= IORESOURCE_IRQ,
 	},
 };