include: extcon: Fix compilation error caused because of incomplete merge

Fix the following compilation error caused due to incomplete merge. This is
observed if CONFIG_EXTCON is not set.

In file included from ./include/linux/mfd/palmas.h:23:0,
                 from drivers/input/misc/palmas-pwrbutton.c:22:
./include/linux/extcon.h: In function ‘extcon_sync’:
./include/linux/extcon.h:361:1: error: expected declaration specifiers before ‘<<’ token
./include/linux/extcon.h:370:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
./include/linux/extcon.h:376:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘>>’ token
./include/linux/extcon.h:381:1: error: expected declaration specifiers before ‘<<’ token
./include/linux/extcon.h:390:1: error: expected declaration specifiers or ‘...’ before ‘==’ token
./include/linux/extcon.h:476:11: warning: ‘struct extcon_specific_cable_nb’ declared inside parameter list [enabled by default]
./include/linux/extcon.h:476:11: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
./include/linux/extcon.h:474:19: error: storage class specified for parameter ‘extcon_register_interest’
./include/linux/extcon.h:474:19: warning: parameter ‘extcon_register_interest’ declared ‘inline’ [enabled by default]
./include/linux/extcon.h:477:1: warning: ‘always_inline’ attribute ignored [-Wattributes]
./include/linux/extcon.h:474:19: error: ‘no_instrument_function’ attribute applies only to functions
./include/linux/extcon.h:477:1: error: expected ‘;’, ‘,’ or ‘)’ before ‘{’ token

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index 2b9f15156115f0cf134d2ae70d56619dcd35ede5..b871c0cb1f02b277df53f835a1d51fe3c99fff28 100644 (file)
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -358,8 +358,6 @@ 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;
 }
@@ -373,50 +371,23 @@ 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,
                                        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)
-{
-       return 0;
-}
-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)
 {