diff options
| author | Kishon Vijay Abraham I <kishon@ti.com> | 2016-09-15 15:46:11 +0530 |
|---|---|---|
| committer | Kishon Vijay Abraham I <kishon@ti.com> | 2016-09-15 16:45:20 +0530 |
| commit | cb9850d092f7d2c86662d71fbfe10685cbddda21 (patch) | |
| tree | 77023cbc002680edbe3738f87dc9be413a8b8e68 /include/linux/extcon.h | |
| parent | 81522637485dd6ec9de4279c9714d58f884b6091 (diff) | |
| parent | b78ea84a7d45b9e5ad2eee429a2140065a39d755 (diff) | |
Merge branch 'next' into resolution
Conflicts:
drivers/extcon/extcon-adc-jack.c
drivers/extcon/extcon-arizona.c
drivers/extcon/extcon-gpio.c
include/linux/extcon.h
Diffstat (limited to 'include/linux/extcon.h')
| -rw-r--r-- | include/linux/extcon.h | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/include/linux/extcon.h b/include/linux/extcon.h index 5c35f9d1822c..2b9f15156115 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -249,7 +249,6 @@ extern int extcon_set_state(struct extcon_dev *edev, unsigned int id, bool cable_state); extern int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id, bool cable_state); - /* * Synchronize the state and property data for a specific external connector. */ @@ -359,10 +358,27 @@ static inline int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id } static inline int extcon_sync(struct extcon_dev *edev, unsigned int id) +<<<<<<< HEAD +======= +{ + return 0; +} + +static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id, + unsigned int prop, + union extcon_property_value *prop_val) +{ + return 0; +} +static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id, + unsigned int prop, + union extcon_property_value prop_val) +>>>>>>> next { return 0; } +<<<<<<< HEAD static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id, unsigned int prop, union extcon_property_value *prop_val) @@ -371,24 +387,36 @@ static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id, } static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id, unsigned int prop, +======= +static inline int extcon_set_property_sync(struct extcon_dev *edev, + unsigned int id, unsigned int prop, +>>>>>>> next union extcon_property_value prop_val) { return 0; } +<<<<<<< HEAD static inline int extcon_set_property_sync(struct extcon_dev *edev, unsigned int id, unsigned int prop, union extcon_property_value prop_val) +======= +static inline int extcon_get_property_capability(struct extcon_dev *edev, + unsigned int id, unsigned int prop) +>>>>>>> next { return 0; } +<<<<<<< HEAD static inline int extcon_get_property_capability(struct extcon_dev *edev, unsigned int id, unsigned int prop) { return 0; } +======= +>>>>>>> next static inline int extcon_set_property_capability(struct extcon_dev *edev, unsigned int id, unsigned int prop) { |