projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d10baf7
)
upstream: [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
Chanho Park
<chanho61.park@samsung.com>
Tue, 18 Nov 2014 02:55:39 +0000
(11:55 +0900)
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
4234f54
..
22f9379
100644
(file)
--- a/
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@
-1263,11
+1263,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;
@@
-1370,7
+1366,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 = {