projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f39fac3
)
[media] rtl28xxu: remove redundant IS_ENABLED macro
author
Antti Palosaari
<crope@iki.fi>
Tue, 4 Jun 2013 19:50:54 +0000
(16:50 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Sun, 9 Jun 2013 00:56:03 +0000
(21:56 -0300)
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
patch
|
blob
|
history
diff --git
a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index 416701167434531be62f7deca578b7098bee3f96..8bbc6abc9d3566aae1d6e720ff628dbe2a8937b8 100644
(file)
--- a/
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@
-1231,11
+1231,7
@@
static int rtl2831u_get_rc_config(struct dvb_usb_device *d,
return 0;
}
-#else
- #define rtl2831u_get_rc_config NULL
-#endif
-#if IS_ENABLED(CONFIG_RC_CORE)
static int rtl2832u_rc_query(struct dvb_usb_device *d)
{
int ret, i, len;
@@
-1338,7
+1334,8
@@
static int rtl2832u_get_rc_config(struct dvb_usb_device *d,
return 0;
}
#else
- #define rtl2832u_get_rc_config NULL
+#define rtl2831u_get_rc_config NULL
+#define rtl2832u_get_rc_config NULL
#endif
static const struct dvb_usb_device_properties rtl2831u_props = {