From eb06d3925f91a20f7affcbf90223eae1fcae9d4e Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Fri, 13 Jul 2012 17:48:56 +0900 Subject: [PATCH] --- yaml --- r: 311944 b: refs/heads/master c: 705c75e3a1785d9d3acdf1b0b3a3afb10e943b15 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-samsung/devs.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e2ba8e255a49..ce179e6b4455 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb1488024786597ffe60971645ce9097af78f972 +refs/heads/master: 705c75e3a1785d9d3acdf1b0b3a3afb10e943b15 diff --git a/trunk/arch/arm/plat-samsung/devs.c b/trunk/arch/arm/plat-samsung/devs.c index 1d214cb9d770..6303974c2ee0 100644 --- a/trunk/arch/arm/plat-samsung/devs.c +++ b/trunk/arch/arm/plat-samsung/devs.c @@ -126,7 +126,8 @@ struct platform_device s3c_device_adc = { #ifdef CONFIG_CPU_S3C2440 static struct resource s3c_camif_resource[] = { [0] = DEFINE_RES_MEM(S3C2440_PA_CAMIF, S3C2440_SZ_CAMIF), - [1] = DEFINE_RES_IRQ(IRQ_CAM), + [1] = DEFINE_RES_IRQ(IRQ_S3C2440_CAM_C), + [2] = DEFINE_RES_IRQ(IRQ_S3C2440_CAM_P), }; struct platform_device s3c_device_camif = {