Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935540AbdCXOHS (ORCPT ); Fri, 24 Mar 2017 10:07:18 -0400 Received: from mga02.intel.com ([134.134.136.20]:33133 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753072AbdCXOHK (ORCPT ); Fri, 24 Mar 2017 10:07:10 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,215,1486454400"; d="scan'208";a="1111784378" From: Andy Shevchenko To: Miguel Ojeda Sandonis , Arnd Bergmann , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Geert Uytterhoeven , Linus Walleij Cc: Andy Shevchenko Subject: [PATCH v1 2/2] auxdisplay: Move arm-charlcd.c to drivers/auxdisplay folder Date: Fri, 24 Mar 2017 16:06:35 +0200 Message-Id: <20170324140635.56565-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170324140635.56565-1-andriy.shevchenko@linux.intel.com> References: <20170324140635.56565-1-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3120 Lines: 87 It looks like arm-charlcd.c belongs to auxdisplay subsystem. Move it to drivers/auxdisplay folder. No functional changes intended. Signed-off-by: Andy Shevchenko --- drivers/auxdisplay/Kconfig | 10 ++++++++++ drivers/auxdisplay/Makefile | 1 + drivers/{misc => auxdisplay}/arm-charlcd.c | 0 drivers/misc/Kconfig | 10 ---------- drivers/misc/Makefile | 1 - 5 files changed, 11 insertions(+), 11 deletions(-) rename drivers/{misc => auxdisplay}/arm-charlcd.c (100%) 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 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 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/ -- 2.11.0