From e576209cba6accdca125b55cd55f5be913a29106 Mon Sep 17 00:00:00 2001
From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Tue, 12 Oct 2010 07:49:18 +0900
Subject: [PATCH] --- yaml --- r: 221134 b: refs/heads/master c:
 023c75c7c8fba0f603faf4458d955f61d213f0c7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f8c7f1ed7c56..4114e2d6b089 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 716d535f3fb7c4f660e0c647cfabcdf4312c4d90
+refs/heads/master: 023c75c7c8fba0f603faf4458d955f61d213f0c7
diff --git a/trunk/arch/arm/mach-s5pv210/include/mach/irqs.h b/trunk/arch/arm/mach-s5pv210/include/mach/irqs.h
index bb7f277c1fa3..119b95fdc3ce 100644
--- a/trunk/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-s5pv210/include/mach/irqs.h
@@ -55,8 +55,8 @@
 #define IRQ_SPI1		S5P_IRQ_VIC1(16)
 #define IRQ_SPI2		S5P_IRQ_VIC1(17)
 #define IRQ_IRDA		S5P_IRQ_VIC1(18)
-#define IRQ_CAN0		S5P_IRQ_VIC1(19)
-#define IRQ_CAN1		S5P_IRQ_VIC1(20)
+#define IRQ_IIC2		S5P_IRQ_VIC1(19)
+#define IRQ_IIC3		S5P_IRQ_VIC1(20)
 #define IRQ_HSIRX		S5P_IRQ_VIC1(21)
 #define IRQ_HSITX		S5P_IRQ_VIC1(22)
 #define IRQ_UHOST		S5P_IRQ_VIC1(23)
diff --git a/trunk/arch/arm/plat-samsung/dev-i2c2.c b/trunk/arch/arm/plat-samsung/dev-i2c2.c
index 07036dee09e7..ff4ba69b6830 100644
--- a/trunk/arch/arm/plat-samsung/dev-i2c2.c
+++ b/trunk/arch/arm/plat-samsung/dev-i2c2.c
@@ -32,8 +32,8 @@ static struct resource s3c_i2c_resource[] = {
 		.flags = IORESOURCE_MEM,
 	},
 	[1] = {
-		.start = IRQ_CAN0,
-		.end   = IRQ_CAN0,
+		.start = IRQ_IIC2,
+		.end   = IRQ_IIC2,
 		.flags = IORESOURCE_IRQ,
 	},
 };