diff options
| author | Jack Pham <jackp@codeaurora.org> | 2016-02-25 18:53:05 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:58:07 -0700 |
| commit | aa00a46cb9f59d2db507ece82e2a5a402c2775d1 (patch) | |
| tree | 51b891a89dda9c958b8795604881755f96408999 /include/linux/usb | |
| parent | adf10d10e855b5096684dffd1d7225ce89c60518 (diff) | |
usb: diag: Fix build error if CONFIG_USB_F_DIAG=m
Instead of #ifdef, use the IS_ENABLED() macro which correctly
handles if the Kconfig symbol is built-in (=y) or a module (=m).
Also add missing MODULE_LICENSE and MODULE_DESCRIPTION to
f_diag.c to allow building as a module.
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/usbdiag.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/usb/usbdiag.h b/include/linux/usb/usbdiag.h index 1e9fa761579a..f66762800368 100644 --- a/include/linux/usb/usbdiag.h +++ b/include/linux/usb/usbdiag.h @@ -49,7 +49,7 @@ struct usb_diag_ch { void *priv_usb; }; -#ifdef CONFIG_USB_F_DIAG +#if IS_ENABLED(CONFIG_USB_F_DIAG) int usb_diag_request_size(struct usb_diag_ch *ch); struct usb_diag_ch *usb_diag_open(const char *name, void *priv, void (*notify)(void *, unsigned, struct diag_request *)); @@ -81,5 +81,5 @@ int usb_diag_write(struct usb_diag_ch *ch, struct diag_request *d_req) { return -ENODEV; } -#endif /* CONFIG_USB_G_ANDROID */ +#endif /* CONFIG_USB_F_DIAG */ #endif /* _DRIVERS_USB_DIAG_H_ */ |