diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-02 16:47:58 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-02 17:28:56 +0100 |
| commit | 24095e766037018e7a4b636834a383f86a9b30f2 (patch) | |
| tree | a32f888068e7efc72b2b5e5cb15ff1846fa2a6c7 /drivers/media/i2c/msp3400-driver.h | |
| parent | [media] usbvision: fix locking error (diff) | |
| download | linux-24095e766037018e7a4b636834a383f86a9b30f2.tar.xz linux-24095e766037018e7a4b636834a383f86a9b30f2.zip | |
[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 <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/i2c/msp3400-driver.h')
| -rw-r--r-- | drivers/media/i2c/msp3400-driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 }; |