summaryrefslogtreecommitdiff
path: root/include/linux/mfd/wm831x
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-03-19 16:12:18 +0300
committerMark Brown <broonie@kernel.org>2019-03-19 16:12:18 +0300
commitc9e48084c88cf901ad0d99a889f2628a5622d90b (patch)
treee95ef2305fa14e0c6e218a6aba8de8df4a0b5798 /include/linux/mfd/wm831x
parent04d1446bce279ee6e4c39b3bf705bef3abba008e (diff)
parent9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff)
downloadlinux-c9e48084c88cf901ad0d99a889f2628a5622d90b.tar.xz
Merge tag 'v5.1-rc1' into regulator-5.2
Linux 5.1-rc1
Diffstat (limited to 'include/linux/mfd/wm831x')
-rw-r--r--include/linux/mfd/wm831x/core.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index b49fa67612f1..6fcb8eb00282 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -418,7 +418,6 @@ int wm831x_bulk_read(struct wm831x *wm831x, unsigned short reg,
int count, u16 *buf);
int wm831x_device_init(struct wm831x *wm831x, int irq);
-void wm831x_device_exit(struct wm831x *wm831x);
int wm831x_device_suspend(struct wm831x *wm831x);
void wm831x_device_shutdown(struct wm831x *wm831x);
int wm831x_irq_init(struct wm831x *wm831x, int irq);