diff mbox

media_build update IS_ENABLED macro

Message ID CAKdnbx4niA+UPaWf=sJCOj61iBTdtT7D0aqc7hvWFi-5biD3kg@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eddi De Pieri Feb. 6, 2013, 8:48 p.m. UTC
Fix media_build by updating IS_ENABLED macro

Signed-off-by: Eddi De Pieri <eddi@depieri.net>


 #ifdef NEED_USB_TRANSLATE_ERRORS
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Eddi De Pieri Feb. 6, 2013, 8:54 p.m. UTC | #1
Sorry ignore my patch.. it's broken

Regards Eddi

On Wed, Feb 6, 2013 at 9:48 PM, Eddi De Pieri <eddi@depieri.net> wrote:
> Fix media_build by updating IS_ENABLED macro
>
> Signed-off-by: Eddi De Pieri <eddi@depieri.net>
>
> diff --git a/v4l/compat.h b/v4l/compat.h
> index 8ef90aa..fd0d139 100644
> --- a/v4l/compat.h
> +++ b/v4l/compat.h
> @@ -1102,7 +1102,7 @@ static inline void i2c_unlock_adapter(struct
> i2c_adapter *adapter)
>  #define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0)
>  #define ___config_enabled(__ignored, val, ...) val
>  #define IS_ENABLED(option) \
> -               (config_enabled(option) || config_enabled(option##_MODULE))
> +               (defined(__enabled_ ## option) || defined(__enabled_
> ## option ## _MODULE))
>  #endif
>
>  #ifdef NEED_USB_TRANSLATE_ERRORS
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/v4l/compat.h b/v4l/compat.h
index 8ef90aa..fd0d139 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1102,7 +1102,7 @@  static inline void i2c_unlock_adapter(struct
i2c_adapter *adapter)
 #define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0)
 #define ___config_enabled(__ignored, val, ...) val
 #define IS_ENABLED(option) \
-               (config_enabled(option) || config_enabled(option##_MODULE))
+               (defined(__enabled_ ## option) || defined(__enabled_
## option ## _MODULE))
 #endif