projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'usb-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[cascardo/linux.git]
/
drivers
/
usb
/
core
/
otg_whitelist.h
diff --git
a/drivers/usb/core/otg_whitelist.h
b/drivers/usb/core/otg_whitelist.h
index
a95b0c9
..
085049d
100644
(file)
--- a/
drivers/usb/core/otg_whitelist.h
+++ b/
drivers/usb/core/otg_whitelist.h
@@
-38,7
+38,7
@@
static struct usb_device_id whitelist_table[] = {
{ USB_DEVICE(0x0525, 0xa4a2), },
#endif
-#if
defined(CONFIG_USB_TEST) || defined(CONFIG_USB_TEST_MODULE
)
+#if
IS_ENABLED(CONFIG_USB_TEST
)
/* gadget zero, for testing */
{ USB_DEVICE(0x0525, 0xa4a0), },
#endif