projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
board-h3.c
diff --git
a/arch/arm/mach-omap1/board-h3.c
b/arch/arm/mach-omap1/board-h3.c
index
2ced6d9
..
adfcd7b
100644
(file)
--- a/
arch/arm/mach-omap1/board-h3.c
+++ b/
arch/arm/mach-omap1/board-h3.c
@@
-476,6
+476,10
@@
static struct i2c_board_info __initdata h3_i2c_board_info[] = {
I2C_BOARD_INFO("tps65013", 0x48),
/* .irq = OMAP_GPIO_IRQ(??), */
},
+ {
+ I2C_BOARD_INFO("isp1301_omap", 0x2d),
+ .irq = OMAP_GPIO_IRQ(14),
+ },
};
static struct omap_gpio_switch h3_gpio_switches[] __initdata = {