lkml.org 
[lkml]   [2019]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/2] auxdisplay: charlcd: move charlcd.h to drivers/auxdisplay
Date
This header is included in drivers/auxdisplay/. Make it a local header.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

drivers/auxdisplay/charlcd.c | 2 +-
{include/misc => drivers/auxdisplay}/charlcd.h | 0
drivers/auxdisplay/hd44780.c | 3 +--
drivers/auxdisplay/panel.c | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
rename {include/misc => drivers/auxdisplay}/charlcd.h (100%)

diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c
index 92745efefb54..bef6b85778b6 100644
--- a/drivers/auxdisplay/charlcd.c
+++ b/drivers/auxdisplay/charlcd.c
@@ -20,7 +20,7 @@

#include <generated/utsrelease.h>

-#include <misc/charlcd.h>
+#include "charlcd.h"

#define LCD_MINOR 156

diff --git a/include/misc/charlcd.h b/drivers/auxdisplay/charlcd.h
similarity index 100%
rename from include/misc/charlcd.h
rename to drivers/auxdisplay/charlcd.h
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! */
diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c
index e06de63497cf..f8ff18ba6889 100644
--- a/drivers/auxdisplay/panel.c
+++ b/drivers/auxdisplay/panel.c
@@ -55,7 +55,7 @@
#include <linux/io.h>
#include <linux/uaccess.h>

-#include <misc/charlcd.h>
+#include "charlcd.h"

#define KEYPAD_MINOR 185

--
2.17.1
\
 
 \ /
  Last update: 2019-08-06 09:17    [W:0.148 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site