[media] it913x: make remote controller optional
authorAntti Palosaari <crope@iki.fi>
Sun, 9 Dec 2012 23:27:59 +0000 (20:27 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 6 Jan 2013 12:17:36 +0000 (10:17 -0200)
Do not compile remote controller when RC-core is disabled by Kconfig.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/dvb-usb-v2/it913x.c

index 744c9f9f76803d9eaed643aa5e6e7857f45e7b93..b8593bda725c0eb2b06a501d97de5b3b4926b39f 100644 (file)
@@ -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;