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:
e32d6eb
)
[media] usb/gspca/zc3xx.c: use IS_ENABLED() macro
author
Peter Senna Tschudin
<
[email protected]
>
Thu, 24 Jan 2013 22:29:13 +0000
(19:29 -0300)
committer
Mauro Carvalho Chehab
<
[email protected]
>
Tue, 5 Feb 2013 16:54:43 +0000
(14:54 -0200)
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <
[email protected]
>
Signed-off-by: Peter Senna Tschudin <
[email protected]
>
Signed-off-by: Hans de Goede <
[email protected]
>
Signed-off-by: Mauro Carvalho Chehab <
[email protected]
>
drivers/media/usb/gspca/zc3xx.c
patch
|
blob
|
history
diff --git
a/drivers/media/usb/gspca/zc3xx.c
b/drivers/media/usb/gspca/zc3xx.c
index 77c57755e7b4623a07c81b2324fb20f291ee1dc0..a8dc421f9f1fad7581da97347e91ee40f143301a 100644
(file)
--- a/
drivers/media/usb/gspca/zc3xx.c
+++ b/
drivers/media/usb/gspca/zc3xx.c
@@
-6902,7
+6902,7
@@
static int sd_get_jcomp(struct gspca_dev *gspca_dev,
return 0;
}
-#if
defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE
)
+#if
IS_ENABLED(CONFIG_INPUT
)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet data */
int len) /* interrput packet length */
@@
-6929,7
+6929,7
@@
static const struct sd_desc sd_desc = {
.pkt_scan = sd_pkt_scan,
.get_jcomp = sd_get_jcomp,
.set_jcomp = sd_set_jcomp,
-#if
defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE
)
+#if
IS_ENABLED(CONFIG_INPUT
)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};