summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski.k@gmail.com>2015-07-15 21:59:50 +0900
committerMark Brown <broonie@kernel.org>2015-07-16 21:39:30 +0100
commit61b305cd2ae747b8c9a2e4467dea2575a390162c (patch)
treef1684ed3322b06b803027fc200c250f2806d8e9e /drivers/input/misc
parent5b5e771fb711f95da859bf6be9fba4bc9919b5d5 (diff)
downloadblackbird-obmc-linux-61b305cd2ae747b8c9a2e4467dea2575a390162c.tar.gz
blackbird-obmc-linux-61b305cd2ae747b8c9a2e4467dea2575a390162c.zip
drivers: max77693: Move state container to common header
This prepares for merging some of the drivers between max77693 and max77843 so the child MFD driver can be attached to any parent MFD main driver. Move the state container to common header file. Additionally add consistent 'i2c' prefixes to its members (of 'struct i2c_client' type). Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> Acked-by: Sebastian Reichel <sre@kernel.org> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Acked-by: Lee Jones <lee.jones@linaro.org> Acked-by: Chanwoo Choi <cw00.choi@samsung.com> Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/max77693-haptic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/misc/max77693-haptic.c b/drivers/input/misc/max77693-haptic.c
index 39e930c10ebb..4524499ea72f 100644
--- a/drivers/input/misc/max77693-haptic.c
+++ b/drivers/input/misc/max77693-haptic.c
@@ -24,6 +24,7 @@
#include <linux/workqueue.h>
#include <linux/regulator/consumer.h>
#include <linux/mfd/max77693.h>
+#include <linux/mfd/max77693-common.h>
#include <linux/mfd/max77693-private.h>
#define MAX_MAGNITUDE_SHIFT 16
OpenPOWER on IntegriCloud