diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-24 22:28:57 (GMT) |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 16:52:46 (GMT) |
commit | 480d3ca13e64ab06200ab2c4dbff462c2ac7494d (patch) | |
tree | 97d33ced1aebe59cc16c9cfbffc154c24426d8fd | |
parent | 58bc8b7e380554d2d32f8d7f776a019cefc8afbf (diff) | |
download | linux-480d3ca13e64ab06200ab2c4dbff462c2ac7494d.tar.xz |
[media] radio/si470x/radio-si470x.h: use IS_ENABLED() macro
replace:
#if defined(CONFIG_USB_SI470X) || \
defined(CONFIG_USB_SI470X_MODULE)
with:
#if IS_ENABLED(CONFIG_USB_SI470X)
This change was made for: CONFIG_USB_SI470X,
CONFIG_I2C_SI470X
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/radio/si470x/radio-si470x.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h index 2f089b4..467e955 100644 --- a/drivers/media/radio/si470x/radio-si470x.h +++ b/drivers/media/radio/si470x/radio-si470x.h @@ -163,7 +163,7 @@ struct si470x_device { struct completion completion; bool status_rssi_auto_update; /* Does RSSI get updated automatic? */ -#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE) +#if IS_ENABLED(CONFIG_USB_SI470X) /* reference to USB and video device */ struct usb_device *usbdev; struct usb_interface *intf; @@ -179,7 +179,7 @@ struct si470x_device { unsigned char hardware_version; #endif -#if defined(CONFIG_I2C_SI470X) || defined(CONFIG_I2C_SI470X_MODULE) +#if IS_ENABLED(CONFIG_I2C_SI470X) struct i2c_client *client; #endif }; |