From 59356f5eca14e15905d82843712e9e5597b91ff0 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Thu, 24 Jan 2013 19:28:57 -0300
Subject: [PATCH] --- yaml --- r: 357391 b: refs/heads/master c:
 480d3ca13e64ab06200ab2c4dbff462c2ac7494d h: refs/heads/master i:   357389:
 2049f4fe16c958bffe1feac8349a2fc1a8fffda2   357387:
 4623eafb7e8bc804e29333c88c961fa4bd749b15   357383:
 31db925efa830df03766b04b69fed820ed8e2d03   357375:
 4065b16c421f96fed0030935d69347ecc575fb21 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/radio/si470x/radio-si470x.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0047e5bb23ec..3859641b94a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58bc8b7e380554d2d32f8d7f776a019cefc8afbf
+refs/heads/master: 480d3ca13e64ab06200ab2c4dbff462c2ac7494d
diff --git a/trunk/drivers/media/radio/si470x/radio-si470x.h b/trunk/drivers/media/radio/si470x/radio-si470x.h
index 2f089b4252df..467e95575488 100644
--- a/trunk/drivers/media/radio/si470x/radio-si470x.h
+++ b/trunk/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
 };