diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-02 20:01:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-02 20:01:07 -0800 |
| commit | 06f9a73ff9ef58a59af593c37020749816735789 (patch) | |
| tree | 71dc2f9ced5fb58ccd4a2d148b707e1ec5e33c07 /include | |
| parent | 25271d8c84dabd926bbf8727d2f6e90fcbce30b6 (diff) | |
| parent | 4b57018dcd6418e18c08088c89f123da8a7bfc45 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Avoid tps6586x burst writes
mfd: Don't suspend WM8994 if the CODEC is not suspended
mfd: Fix DaVinci voice codec device name
mfd: Fix NULL pointer due to non-initialized ucb1x00-ts absinfo
mfd: Fix ASIC3 build with GENERIC_HARDIRQS_NO_DEPRECATED
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/wm8994/core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h index 3fd36845ca45..ef4f0b6083a3 100644 --- a/include/linux/mfd/wm8994/core.h +++ b/include/linux/mfd/wm8994/core.h @@ -71,6 +71,7 @@ struct wm8994 { u16 irq_masks_cache[WM8994_NUM_IRQ_REGS]; /* Used over suspend/resume */ + bool suspended; u16 ldo_regs[WM8994_NUM_LDO_REGS]; u16 gpio_regs[WM8994_NUM_GPIO_REGS]; |