projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20151106' of git://git.infradead.org/linux-mtd
[cascardo/linux.git]
/
drivers
/
mfd
/
88pm80x.c
diff --git
a/drivers/mfd/88pm80x.c
b/drivers/mfd/88pm80x.c
index
5e72f65
..
63445ea
100644
(file)
--- a/
drivers/mfd/88pm80x.c
+++ b/
drivers/mfd/88pm80x.c
@@
-33,6
+33,8
@@
static struct pm80x_chip_mapping chip_mapping[] = {
{0x3, CHIP_PM800},
/* 88PM805 chip id number */
{0x0, CHIP_PM805},
+ /* 88PM860 chip id number */
+ {0x4, CHIP_PM860},
};
/*