diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 12:27:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 12:27:34 +0100 |
| commit | f9cef506815386df4bd7e463b59e0a0984ce0355 (patch) | |
| tree | b26a202b2f0472e3ebe889012312b115917717f9 /arch/arm/plat-samsung/dev-i2c2.c | |
| parent | 9ae21ca362679757786f5abe556c7943e9001426 (diff) | |
| parent | cbff3eb3e6e3c618583a7435f87c1548aa12b0ad (diff) | |
| download | kernel_samsung_smdk4412-f9cef506815386df4bd7e463b59e0a0984ce0355.zip kernel_samsung_smdk4412-f9cef506815386df4bd7e463b59e0a0984ce0355.tar.gz kernel_samsung_smdk4412-f9cef506815386df4bd7e463b59e0a0984ce0355.tar.bz2 | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mach-s3c64xx/dev-audio.c
Diffstat (limited to 'arch/arm/plat-samsung/dev-i2c2.c')
| -rw-r--r-- | arch/arm/plat-samsung/dev-i2c2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/dev-i2c2.c b/arch/arm/plat-samsung/dev-i2c2.c index 07036de..ff4ba69 100644 --- a/arch/arm/plat-samsung/dev-i2c2.c +++ b/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, }, }; |