diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-04-04 20:25:22 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-08 18:48:20 +0300 |
| commit | 00846a4425d373761c70cbe82cceb98d3d4da179 (patch) | |
| tree | 38d8ecd3954282bb3caf0d1510eee861658ca311 /drivers | |
| parent | 51c1e9b554c996284d5d3bd44da829f41a49a21b (diff) | |
| download | linux-00846a4425d373761c70cbe82cceb98d3d4da179.tar.xz | |
auxdisplay: Move arm-charlcd.c to drivers/auxdisplay folder
It looks like arm-charlcd.c belongs to auxdisplay subsystem.
Move it to drivers/auxdisplay folder.
No functional changes intended.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/auxdisplay/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/auxdisplay/Makefile | 1 | ||||
| -rw-r--r-- | drivers/auxdisplay/arm-charlcd.c (renamed from drivers/misc/arm-charlcd.c) | 0 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 1 |
5 files changed, 11 insertions, 11 deletions
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig index ad83a0598c67..9ae6681c90ad 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig @@ -157,6 +157,16 @@ config HT16K33 endif # AUXDISPLAY +config ARM_CHARLCD + bool "ARM Ltd. Character LCD Driver" + depends on PLAT_VERSATILE + help + This is a driver for the character LCD found on the ARM Ltd. + Versatile and RealView Platform Baseboards. It doesn't do + very much more than display the text "ARM Linux" on the first + line and the Linux version on the second line, but that's + still useful. + config PANEL tristate "Parallel port LCD/Keypad Panel support" depends on PARPORT diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile index 58c25e5ece84..2b8af3dc5e42 100644 --- a/drivers/auxdisplay/Makefile +++ b/drivers/auxdisplay/Makefile @@ -3,6 +3,7 @@ # obj-$(CONFIG_CHARLCD) += charlcd.o +obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o obj-$(CONFIG_KS0108) += ks0108.o obj-$(CONFIG_CFAG12864B) += cfag12864b.o cfag12864bfb.o obj-$(CONFIG_IMG_ASCII_LCD) += img-ascii-lcd.o diff --git a/drivers/misc/arm-charlcd.c b/drivers/auxdisplay/arm-charlcd.c index b3176ee92b90..b3176ee92b90 100644 --- a/drivers/misc/arm-charlcd.c +++ b/drivers/auxdisplay/arm-charlcd.c diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 2438466c15ac..39d1acb27452 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -419,16 +419,6 @@ config VMWARE_BALLOON To compile this driver as a module, choose M here: the module will be called vmw_balloon. -config ARM_CHARLCD - bool "ARM Ltd. Character LCD Driver" - depends on PLAT_VERSATILE - help - This is a driver for the character LCD found on the ARM Ltd. - Versatile and RealView Platform Baseboards. It doesn't do - very much more than display the text "ARM Linux" on the first - line and the Linux version on the second line, but that's - still useful. - config PCH_PHUB tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB" select GENERIC_NET_UTILS diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 9a9f7e72aa54..4c4d6dc03181 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -37,7 +37,6 @@ obj-y += eeprom/ obj-y += cb710/ obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o -obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o obj-$(CONFIG_PCH_PHUB) += pch_phub.o obj-y += ti-st/ obj-y += lis3lv02d/ |