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 'next' into for-linus
[pandora-kernel.git]
/
include
/
linux
/
mfd
/
max8997.h
diff --git
a/include/linux/mfd/max8997.h
b/include/linux/mfd/max8997.h
index
cb671b3
..
60931d0
100644
(file)
--- a/
include/linux/mfd/max8997.h
+++ b/
include/linux/mfd/max8997.h
@@
-78,8
+78,11
@@
struct max8997_regulator_data {
};
struct max8997_platform_data {
- bool wakeup;
- /* IRQ: Not implemented */
+ /* IRQ */
+ int irq_base;
+ int ono;
+ int wakeup;
+
/* ---- PMIC ---- */
struct max8997_regulator_data *regulators;
int num_regulators;