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>

diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index ad83a0598c67954f11972ae6d60036720b551e8f..9ae6681c90ad265920c80888115e76e9c95f9426 100644 (file)
--- 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 58c25e5ece8487f1f8ab93de3722314c32d9c908..2b8af3dc5e427137baa63721ff8851e0dcb9dbab 100644 (file)
--- 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
similarity index 100%
rename from drivers/misc/arm-charlcd.c
rename to drivers/auxdisplay/arm-charlcd.c

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 2438466c15acefeee2abdffa51934b00e4799fd9..39d1acb2745263d361306e0aeb9672e6d68ce310 100644 (file)
--- 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 9a9f7e72aa54aff382802d15ea8e55c2e76053fe..4c4d6dc03181bc7c47ff17e8df654e9c44ff2d29 100644 (file)
--- 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/