From 2985a98243ac7ca0ac2537edb716678c8f59955e Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Sun, 9 Dec 2012 20:27:59 -0300
Subject: [PATCH] --- yaml --- r: 357335 b: refs/heads/master c:
 b963c2083ae3ec67052dfc6e2ec8216c479843d8 h: refs/heads/master i:   357333:
 bbb76a7dc5eb315412848ab410556f27d37e2f5b   357331:
 e53c2ab0c2f80b486febe23d51436fe7e84f37d4   357327:
 4331bd42d86da9784c2b0fe3327dbcea6977650c v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/usb/dvb-usb-v2/it913x.c | 36 ++++++++++++---------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 8a08d15b0b51..5416a33473f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b75322af1bd3b365ce3a5f2ac6df329bf725656
+refs/heads/master: b963c2083ae3ec67052dfc6e2ec8216c479843d8
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/it913x.c b/trunk/drivers/media/usb/dvb-usb-v2/it913x.c
index 744c9f9f7680..b8593bda725c 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/it913x.c
+++ b/trunk/drivers/media/usb/dvb-usb-v2/it913x.c
@@ -308,6 +308,7 @@ static struct i2c_algorithm it913x_i2c_algo = {
 };
 
 /* Callbacks for DVB USB */
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
 #define IT913X_POLL 250
 static int it913x_rc_query(struct dvb_usb_device *d)
 {
@@ -334,6 +335,25 @@ static int it913x_rc_query(struct dvb_usb_device *d)
 	return ret;
 }
 
+static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
+{
+	struct it913x_state *st = d->priv;
+
+	if (st->proprietary_ir == false) {
+		rc->map_name = NULL;
+		return 0;
+	}
+
+	rc->allowed_protos = RC_BIT_NEC;
+	rc->query = it913x_rc_query;
+	rc->interval = 250;
+
+	return 0;
+}
+#else
+	#define it913x_get_rc_config NULL
+#endif
+
 /* Firmware sets raw */
 static const char fw_it9135_v1[] = FW_IT9135_V1;
 static const char fw_it9135_v2[] = FW_IT9135_V2;
@@ -696,22 +716,6 @@ static int it913x_frontend_attach(struct dvb_usb_adapter *adap)
 }
 
 /* DVB USB Driver */
-static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
-{
-	struct it913x_state *st = d->priv;
-
-	if (st->proprietary_ir == false) {
-		rc->map_name = NULL;
-		return 0;
-	}
-
-	rc->allowed_protos = RC_BIT_NEC;
-	rc->query = it913x_rc_query;
-	rc->interval = 250;
-
-	return 0;
-}
-
 static int it913x_get_adapter_count(struct dvb_usb_device *d)
 {
 	struct it913x_state *st = d->priv;