diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
| commit | 9bafc74163d8bccca9810159aab39be926fb877c (patch) | |
| tree | baa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/plat-samsung/dev-i2c2.c | |
| parent | ARM: memblock: setup lowmem mappings using memblock (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable (diff) | |
| download | linux-dev-9bafc74163d8bccca9810159aab39be926fb877c.tar.xz linux-dev-9bafc74163d8bccca9810159aab39be926fb877c.zip | |
Merge branch 'devel-stable' into devel
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 07036dee09e7..ff4ba69b6830 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, }, }; |