From 3a56e8e2223c6e1c04a5a3c8b6fe8d6d54e6fe67 Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 20 Aug 2010 21:09:18 +0900
Subject: [PATCH] --- yaml --- r: 221064 b: refs/heads/master c:
 eda9c023b1d6c986c7191de78ba3f09acf366c0f h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-s5pv210/include/mach/irqs.h | 2 +-
 trunk/arch/arm/mach-s5pv310/include/mach/irqs.h | 5 +++++
 trunk/arch/arm/plat-samsung/dev-hsmmc3.c        | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 87969ed67394..d68f7e5f914a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33f469d2d9ea1e4bd29b6840ea73cf0ea2f1515c
+refs/heads/master: eda9c023b1d6c986c7191de78ba3f09acf366c0f
diff --git a/trunk/arch/arm/mach-s5pv210/include/mach/irqs.h b/trunk/arch/arm/mach-s5pv210/include/mach/irqs.h
index e1c020e5a49b..cdb8ae415124 100644
--- a/trunk/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-s5pv210/include/mach/irqs.h
@@ -109,7 +109,7 @@
 
 #define IRQ_IPC			S5P_IRQ_VIC3(0)
 #define IRQ_HOSTIF		S5P_IRQ_VIC3(1)
-#define IRQ_MMC3		S5P_IRQ_VIC3(2)
+#define IRQ_HSMMC3		S5P_IRQ_VIC3(2)
 #define IRQ_CEC			S5P_IRQ_VIC3(3)
 #define IRQ_TSI			S5P_IRQ_VIC3(4)
 #define IRQ_MDNIE0		S5P_IRQ_VIC3(5)
diff --git a/trunk/arch/arm/mach-s5pv310/include/mach/irqs.h b/trunk/arch/arm/mach-s5pv310/include/mach/irqs.h
index 471fc3bb199a..7b4b09fb7cc9 100644
--- a/trunk/arch/arm/mach-s5pv310/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-s5pv310/include/mach/irqs.h
@@ -68,6 +68,11 @@
 
 #define IRQ_IIC			COMBINER_IRQ(27, 0)
 
+#define IRQ_HSMMC0		COMBINER_IRQ(29, 0)
+#define IRQ_HSMMC1		COMBINER_IRQ(29, 1)
+#define IRQ_HSMMC2		COMBINER_IRQ(29, 2)
+#define IRQ_HSMMC3		COMBINER_IRQ(29, 3)
+
 #define IRQ_ONENAND_AUDI	COMBINER_IRQ(34, 0)
 
 /* Set the default NR_IRQS */
diff --git a/trunk/arch/arm/plat-samsung/dev-hsmmc3.c b/trunk/arch/arm/plat-samsung/dev-hsmmc3.c
index 85aaf0f2842f..335bc35044d3 100644
--- a/trunk/arch/arm/plat-samsung/dev-hsmmc3.c
+++ b/trunk/arch/arm/plat-samsung/dev-hsmmc3.c
@@ -33,8 +33,8 @@ static struct resource s3c_hsmmc3_resource[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
-		.start	= IRQ_MMC3,
-		.end	= IRQ_MMC3,
+		.start	= IRQ_HSMMC3,
+		.end	= IRQ_HSMMC3,
 		.flags	= IORESOURCE_IRQ,
 	}
 };