git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
arch
/
arm
/
plat-samsung
/
dev-i2c2.c
diff --git
a/arch/arm/plat-samsung/dev-i2c2.c
b/arch/arm/plat-samsung/dev-i2c2.c
index
07036de
..
ff4ba69
100644
(file)
--- 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,
},
};