diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-25 10:59:19 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-25 10:59:19 +0300 |
| commit | 8d58b66ed2b000f27658c88a4ed70e8042e86a58 (patch) | |
| tree | 5bae2c74f932b5d863f72cb698a6f71260340b26 /include/linux/extcon/extcon-adc-jack.h | |
| parent | 13fe86f465b72fc9328d4f5ebc33223c011852ae (diff) | |
| parent | c13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff) | |
Merge tag 'v4.2-rc8' into x86/mm, before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/extcon/extcon-adc-jack.h')
| -rw-r--r-- | include/linux/extcon/extcon-adc-jack.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/extcon/extcon-adc-jack.h b/include/linux/extcon/extcon-adc-jack.h index 9ca958c4e94c..53c60806bcfb 100644 --- a/include/linux/extcon/extcon-adc-jack.h +++ b/include/linux/extcon/extcon-adc-jack.h @@ -44,7 +44,7 @@ struct adc_jack_cond { * @consumer_channel: Unique name to identify the channel on the consumer * side. This typically describes the channels used within * the consumer. E.g. 'battery_voltage' - * @cable_names: array of cable names ending with null. + * @cable_names: array of extcon id for supported cables. * @adc_contitions: array of struct adc_jack_cond conditions ending * with .state = 0 entry. This describes how to decode * adc values into extcon state. @@ -58,8 +58,7 @@ struct adc_jack_pdata { const char *name; const char *consumer_channel; - /* The last entry should be NULL */ - const char **cable_names; + const enum extcon *cable_names; /* The last entry's state should be 0 */ struct adc_jack_cond *adc_conditions; |