From: Arnd Bergmann Date: Tue, 2 Feb 2016 15:47:58 +0000 (-0200) Subject: [media] msp3400: use IS_ENABLED check instead of #if X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24095e766037018e7a4b636834a383f86a9b30f2;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [media] msp3400: use IS_ENABLED check instead of #if A recent patch broke the msp3400 driver when CONFIG_MEDIA_CONTROLLER is not set: drivers/media/i2c/msp3400-driver.h:107:5: error: "CONFIG_MEDIA_CONTROLLER" is not defined [-Werror=undef] It was clearly a typo, and this patch changes the "#if CONFIG_MEDIA_CONTROLLER" to a working IS_ENABLED() check. Fixes: fb4932821731 ("[media] msp3400: initialize MC data") Signed-off-by: Arnd Bergmann Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/msp3400-driver.h b/drivers/media/i2c/msp3400-driver.h index f0bb37dc9013..a8702aca187a 100644 --- a/drivers/media/i2c/msp3400-driver.h +++ b/drivers/media/i2c/msp3400-driver.h @@ -104,7 +104,7 @@ struct msp_state { unsigned int restart:1; unsigned int watch_stereo:1; -#if CONFIG_MEDIA_CONTROLLER +#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER) struct media_pad pads[IF_AUD_DEC_PAD_NUM_PADS]; #endif };