diff options
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/palmas.h | 1 | ||||
-rw-r--r-- | include/linux/mfd/tps65912.h | 1 | ||||
-rw-r--r-- | include/linux/mfd/wm831x/auxadc.h | 2 | ||||
-rw-r--r-- | include/linux/mfd/wm831x/core.h | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index a4d13d7cd001..3bbda22721ea 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h | |||
@@ -221,6 +221,7 @@ struct palmas_clk_platform_data { | |||
221 | }; | 221 | }; |
222 | 222 | ||
223 | struct palmas_platform_data { | 223 | struct palmas_platform_data { |
224 | int irq_flags; | ||
224 | int gpio_base; | 225 | int gpio_base; |
225 | 226 | ||
226 | /* bit value to be loaded to the POWER_CTRL register */ | 227 | /* bit value to be loaded to the POWER_CTRL register */ |
diff --git a/include/linux/mfd/tps65912.h b/include/linux/mfd/tps65912.h index aaceab402ec5..6d309032dc0d 100644 --- a/include/linux/mfd/tps65912.h +++ b/include/linux/mfd/tps65912.h | |||
@@ -323,5 +323,6 @@ int tps65912_device_init(struct tps65912 *tps65912); | |||
323 | void tps65912_device_exit(struct tps65912 *tps65912); | 323 | void tps65912_device_exit(struct tps65912 *tps65912); |
324 | int tps65912_irq_init(struct tps65912 *tps65912, int irq, | 324 | int tps65912_irq_init(struct tps65912 *tps65912, int irq, |
325 | struct tps65912_platform_data *pdata); | 325 | struct tps65912_platform_data *pdata); |
326 | int tps65912_irq_exit(struct tps65912 *tps65912); | ||
326 | 327 | ||
327 | #endif /* __LINUX_MFD_TPS65912_H */ | 328 | #endif /* __LINUX_MFD_TPS65912_H */ |
diff --git a/include/linux/mfd/wm831x/auxadc.h b/include/linux/mfd/wm831x/auxadc.h index b132067e9e99..867aa23f9370 100644 --- a/include/linux/mfd/wm831x/auxadc.h +++ b/include/linux/mfd/wm831x/auxadc.h | |||
@@ -15,6 +15,8 @@ | |||
15 | #ifndef __MFD_WM831X_AUXADC_H__ | 15 | #ifndef __MFD_WM831X_AUXADC_H__ |
16 | #define __MFD_WM831X_AUXADC_H__ | 16 | #define __MFD_WM831X_AUXADC_H__ |
17 | 17 | ||
18 | struct wm831x; | ||
19 | |||
18 | /* | 20 | /* |
19 | * R16429 (0x402D) - AuxADC Data | 21 | * R16429 (0x402D) - AuxADC Data |
20 | */ | 22 | */ |
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h index 4a3b83a77614..76c22648436f 100644 --- a/include/linux/mfd/wm831x/core.h +++ b/include/linux/mfd/wm831x/core.h | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/irqdomain.h> | 20 | #include <linux/irqdomain.h> |
21 | #include <linux/list.h> | 21 | #include <linux/list.h> |
22 | #include <linux/regmap.h> | 22 | #include <linux/regmap.h> |
23 | #include <linux/mfd/wm831x/auxadc.h> | ||
23 | 24 | ||
24 | /* | 25 | /* |
25 | * Register values. | 26 | * Register values. |
@@ -355,7 +356,6 @@ enum wm831x_parent { | |||
355 | }; | 356 | }; |
356 | 357 | ||
357 | struct wm831x; | 358 | struct wm831x; |
358 | enum wm831x_auxadc; | ||
359 | 359 | ||
360 | typedef int (*wm831x_auxadc_read_fn)(struct wm831x *wm831x, | 360 | typedef int (*wm831x_auxadc_read_fn)(struct wm831x *wm831x, |
361 | enum wm831x_auxadc input); | 361 | enum wm831x_auxadc input); |