projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hid
/
hid-picolcd.h
diff --git
a/drivers/hid/hid-picolcd.h
b/drivers/hid/hid-picolcd.h
index 2941891ecac2747616258beabbb932acad31f793..e56d847b2ef1996dfee6c5f60c39401db35dcf15 100644
(file)
--- a/
drivers/hid/hid-picolcd.h
+++ b/
drivers/hid/hid-picolcd.h
@@
-302,7
+302,7
@@
static inline int picolcd_init_cir(struct picolcd_data *data, struct hid_report
static inline void picolcd_exit_cir(struct picolcd_data *data)
{
}
static inline void picolcd_exit_cir(struct picolcd_data *data)
{
}
-#endif /* CONFIG_HID_PICOLCD_
LIRC
*/
+#endif /* CONFIG_HID_PICOLCD_
CIR
*/
int picolcd_reset(struct hid_device *hdev);
struct picolcd_pending *picolcd_send_and_wait(struct hid_device *hdev,
int picolcd_reset(struct hid_device *hdev);
struct picolcd_pending *picolcd_send_and_wait(struct hid_device *hdev,