aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-12-09 18:06:00 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-01-06 07:15:30 -0500
commitcedda37015e90e58458fd91635ff8ef5d144d3f5 (patch)
tree8c99dd7b9a5b7748c8119c2d9481a0b565310840
parent0c87c66aa383b045c437e7cf456eef28a8aa7b66 (diff)
[media] rtl28xxu: make remote controller optional
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>
-rw-r--r--drivers/media/usb/dvb-usb-v2/rtl28xxu.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index eddda6958c19..9a6890392e90 100644
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -1125,7 +1125,7 @@ err:
1125 return ret; 1125 return ret;
1126} 1126}
1127 1127
1128 1128#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
1129static int rtl2831u_rc_query(struct dvb_usb_device *d) 1129static int rtl2831u_rc_query(struct dvb_usb_device *d)
1130{ 1130{
1131 int ret, i; 1131 int ret, i;
@@ -1208,7 +1208,11 @@ static int rtl2831u_get_rc_config(struct dvb_usb_device *d,
1208 1208
1209 return 0; 1209 return 0;
1210} 1210}
1211#else
1212 #define rtl2831u_get_rc_config NULL
1213#endif
1211 1214
1215#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
1212static int rtl2832u_rc_query(struct dvb_usb_device *d) 1216static int rtl2832u_rc_query(struct dvb_usb_device *d)
1213{ 1217{
1214 int ret, i; 1218 int ret, i;
@@ -1280,6 +1284,9 @@ static int rtl2832u_get_rc_config(struct dvb_usb_device *d,
1280 1284
1281 return 0; 1285 return 0;
1282} 1286}
1287#else
1288 #define rtl2832u_get_rc_config NULL
1289#endif
1283 1290
1284static const struct dvb_usb_device_properties rtl2831u_props = { 1291static const struct dvb_usb_device_properties rtl2831u_props = {
1285 .driver_name = KBUILD_MODNAME, 1292 .driver_name = KBUILD_MODNAME,