diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 11:59:36 +0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 11:59:36 +0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /include/linux/mfd/max8997.h | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
| download | linux-6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0.tar.xz | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'include/linux/mfd/max8997.h')
| -rw-r--r-- | include/linux/mfd/max8997.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h index cb671b3451bf..60931d089422 100644 --- 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; |