Merge branch 'for-4.19/i2c-hid' into for-linus

[sfrench/cifs-2.6.git] / include / linux / platform_data / i2c-hid.h

diff --git a/include/linux/platform_data/i2c-hid.h b/include/linux/platform_data/i2c-hid.h
index 1fb088239d12b9f4a5a849a2ce662343743c8bd9..c628bb5e10610c59f2464675088966f2e7036b91 100644 (file)
--- a/include/linux/platform_data/i2c-hid.h
+++ b/include/linux/platform_data/i2c-hid.h
@@ -12,14 +12,13 @@
 #ifndef __LINUX_I2C_HID_H
 #define __LINUX_I2C_HID_H
 
+#include <linux/regulator/consumer.h>
 #include <linux/types.h>
 
-struct regulator;
-
 /**
  * struct i2chid_platform_data - used by hid over i2c implementation.
  * @hid_descriptor_address: i2c register where the HID descriptor is stored.
- * @supply: regulator for powering on the device.
+ * @supplies: regulators for powering on the device.
  * @post_power_delay_ms: delay after powering on before device is usable.
  *
  * Note that it is the responsibility of the platform driver (or the acpi 5.0
@@ -35,7 +34,7 @@ struct regulator;
  */
 struct i2c_hid_platform_data {
        u16 hid_descriptor_address;
-       struct regulator *supply;
+       struct regulator_bulk_data supplies[2];
        int post_power_delay_ms;
 };