Re: [PATCH] include: extcon: Fix compilation error caused because of incomplete merge

[Greg KH]

On Fri, Sep 16, 2016 at 12:19:07PM +0530, Kishon Vijay Abraham I wrote:
> 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@xxxxxx>
> ---
>  include/linux/extcon.h |   29 -----------------------------
>  1 file changed, 29 deletions(-)
> 
> diff --git a/include/linux/extcon.h b/include/linux/extcon.h
> index 2b9f151..b871c0c 100644
> --- 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;
>  }

Ugh, what a mess :(

Now applied, thanks.

greg k-h