From 781791f858d1952f4d3e0bee4ace3df27fd82e79 Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Sun, 9 Dec 2012 20:15:47 -0300 Subject: [PATCH] --- yaml --- r: 357332 b: refs/heads/master c: b6215596b5912c205ed48c11deb1cbdf0aa3ac25 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/dvb-usb-v2/af9015.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e102024fdf37..34bdc96a8402 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5c6209068aeca3d464f4161006e637a6087008c +refs/heads/master: b6215596b5912c205ed48c11deb1cbdf0aa3ac25 diff --git a/trunk/drivers/media/usb/dvb-usb-v2/af9015.c b/trunk/drivers/media/usb/dvb-usb-v2/af9015.c index 943d93423705..51505d198f44 100644 --- a/trunk/drivers/media/usb/dvb-usb-v2/af9015.c +++ b/trunk/drivers/media/usb/dvb-usb-v2/af9015.c @@ -1156,6 +1156,7 @@ static int af9015_init(struct dvb_usb_device *d) return ret; } +#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE) struct af9015_rc_setup { unsigned int id; char *rc_codes; @@ -1312,6 +1313,9 @@ static int af9015_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc) return 0; } +#else + #define af9015_get_rc_config NULL +#endif /* interface 0 is used by DVB-T receiver and interface 1 is for remote controller (HID) */