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 branch 'topic/pcm-subclass-fix' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
imote2.c
diff --git
a/arch/arm/mach-pxa/imote2.c
b/arch/arm/mach-pxa/imote2.c
index
2121309
..
2b27336
100644
(file)
--- a/
arch/arm/mach-pxa/imote2.c
+++ b/
arch/arm/mach-pxa/imote2.c
@@
-412,7
+412,7
@@
static struct platform_device imote2_flash_device = {
*/
static struct i2c_board_info __initdata imote2_i2c_board_info[] = {
{ /* UCAM sensor board */
- .type = "max123
8
",
+ .type = "max123
9
",
.addr = 0x35,
}, { /* ITS400 Sensor board only */
.type = "max1363",