diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 13:58:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 13:58:20 +1100 |
| commit | 9ddf05563a32c4b104b988527b89a6ba932217d7 (patch) | |
| tree | 50adb256d425b2bd34eac1e61c9df0120c23a019 /include | |
| parent | 905c77309bceee55f6536afa65298c5890dcc361 (diff) | |
| parent | 125331c753c42bc3f74a723a14a40f723740e493 (diff) | |
Merge remote branch 'mfd/for-next'
Conflicts:
drivers/mfd/wm8994-core.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/core.h | 6 | ||||
| -rw-r--r-- | include/linux/mfd/wm831x/core.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h index cb93d80aa642..2643ef5e8796 100644 --- a/include/linux/mfd/core.h +++ b/include/linux/mfd/core.h @@ -47,6 +47,12 @@ struct mfd_cell { /* don't check for resource conflicts */ bool ignore_resource_conflicts; + + /* + * Disable runtime PM callbacks for this subdevice - see + * pm_runtime_no_callbacks(). + */ + bool pm_runtime_no_callbacks; }; extern int mfd_add_devices(struct device *parent, int id, diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h index a1239c48b41a..903280d21866 100644 --- a/include/linux/mfd/wm831x/core.h +++ b/include/linux/mfd/wm831x/core.h @@ -245,6 +245,7 @@ enum wm831x_parent { WM8320 = 0x8320, WM8321 = 0x8321, WM8325 = 0x8325, + WM8326 = 0x8326, }; struct wm831x { |