summaryrefslogtreecommitdiff
path: root/drivers/auxdisplay/hd44780.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2019-09-22 22:29:00 +0200
committerJiri Kosina <jkosina@suse.cz>2019-09-22 22:29:00 +0200
commit53c716412708db7000e06292fb89b2609f9a48f7 (patch)
tree3ede481ee0926f0e53e14bba61028d307d58296c /drivers/auxdisplay/hd44780.c
parente6d64ce06c28b615ebfeab7b8bfad6136ea83095 (diff)
parentaec256d0ecd561036f188dbc8fa7924c47a9edfd (diff)
Merge branch 'for-5.4/apple' into for-linus
- stuck 'fn' key fix for hid-apple from Joao Moreno Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/auxdisplay/hd44780.c')
-rw-r--r--drivers/auxdisplay/hd44780.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c
index ab15b64707ad..bcbe13092327 100644
--- a/drivers/auxdisplay/hd44780.c
+++ b/drivers/auxdisplay/hd44780.c
@@ -14,8 +14,7 @@
#include <linux/property.h>
#include <linux/slab.h>
-#include <misc/charlcd.h>
-
+#include "charlcd.h"
enum hd44780_pin {
/* Order does matter due to writing to GPIO array subsets! */