diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/extcon.h | 2 | ||||
-rw-r--r-- | include/linux/mfd/max77693.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/linux/extcon.h b/include/linux/extcon.h index 7443a560c9d0..2c26c14cd710 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h | |||
@@ -68,7 +68,7 @@ enum extcon_cable_name { | |||
68 | EXTCON_VIDEO_OUT, | 68 | EXTCON_VIDEO_OUT, |
69 | EXTCON_MECHANICAL, | 69 | EXTCON_MECHANICAL, |
70 | }; | 70 | }; |
71 | extern const char *extcon_cable_name[]; | 71 | extern const char extcon_cable_name[][CABLE_NAME_MAX + 1]; |
72 | 72 | ||
73 | struct extcon_cable; | 73 | struct extcon_cable; |
74 | 74 | ||
diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h index 1d28ae90384e..fe03b2d35d4f 100644 --- a/include/linux/mfd/max77693.h +++ b/include/linux/mfd/max77693.h | |||
@@ -30,7 +30,20 @@ | |||
30 | #ifndef __LINUX_MFD_MAX77693_H | 30 | #ifndef __LINUX_MFD_MAX77693_H |
31 | #define __LINUX_MFD_MAX77693_H | 31 | #define __LINUX_MFD_MAX77693_H |
32 | 32 | ||
33 | struct max77693_reg_data { | ||
34 | u8 addr; | ||
35 | u8 data; | ||
36 | }; | ||
37 | |||
38 | struct max77693_muic_platform_data { | ||
39 | struct max77693_reg_data *init_data; | ||
40 | int num_init_data; | ||
41 | }; | ||
42 | |||
33 | struct max77693_platform_data { | 43 | struct max77693_platform_data { |
34 | int wakeup; | 44 | int wakeup; |
45 | |||
46 | /* muic data */ | ||
47 | struct max77693_muic_platform_data *muic_data; | ||
35 | }; | 48 | }; |
36 | #endif /* __LINUX_MFD_MAX77693_H */ | 49 | #endif /* __LINUX_MFD_MAX77693_H */ |