summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd/wm831x
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-01-31 21:16:22 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-01-31 21:16:22 -0800
commita1f3d4bba8ea395a39d34ade6017afee8be16031 (patch)
tree874d843d35622f17aa6c3e048e42cf0d679bcb75 /include/linux/mfd/wm831x
parent723d928417bffff6467da155d8ebbbe016464012 (diff)
parentebf53826e105f488f4f628703a108e98940d1dc5 (diff)
downloadblackbird-op-linux-a1f3d4bba8ea395a39d34ade6017afee8be16031.tar.gz
blackbird-op-linux-a1f3d4bba8ea395a39d34ade6017afee8be16031.zip
Merge commit 'v2.6.38-rc3' into next
Diffstat (limited to 'include/linux/mfd/wm831x')
-rw-r--r--include/linux/mfd/wm831x/core.h1
1 files changed, 1 insertions, 0 deletions
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 {
OpenPOWER on IntegriCloud