From patchwork Thu Dec 10 14:25:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 7819301 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B1117BEEE1 for ; Thu, 10 Dec 2015 14:26:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DB431202A1 for ; Thu, 10 Dec 2015 14:26:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1F49205B8 for ; Thu, 10 Dec 2015 14:26:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752706AbbLJO0R (ORCPT ); Thu, 10 Dec 2015 09:26:17 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:46064 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752380AbbLJO0R (ORCPT ); Thu, 10 Dec 2015 09:26:17 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id tBAEQD7a001011; Thu, 10 Dec 2015 08:26:13 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id tBAEQD6P003507; Thu, 10 Dec 2015 08:26:13 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Thu, 10 Dec 2015 08:26:12 -0600 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id tBAEPq7n022839; Thu, 10 Dec 2015 08:26:11 -0600 From: Tomi Valkeinen To: , , Laurent Pinchart CC: Daniel Vetter , Dave Airlie , Rob Clark , Tomi Valkeinen Subject: [PATCH RFC 7/9] omapfb: move vrfb into omapfb Date: Thu, 10 Dec 2015 16:25:33 +0200 Message-ID: <1449757535-5674-8-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com> References: <1449757535-5674-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP VRFB is only used by omapfb, so we can move it under omapfb's directory. Signed-off-by: Tomi Valkeinen --- drivers/video/fbdev/omap2/Kconfig | 3 --- drivers/video/fbdev/omap2/Makefile | 2 -- drivers/video/fbdev/omap2/omapfb/Kconfig | 3 +++ drivers/video/fbdev/omap2/omapfb/Makefile | 1 + drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c | 0 5 files changed, 4 insertions(+), 5 deletions(-) rename drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c (100%) diff --git a/drivers/video/fbdev/omap2/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c similarity index 100% rename from drivers/video/fbdev/omap2/vrfb.c rename to drivers/video/fbdev/omap2/omapfb/vrfb.c diff --git a/drivers/video/fbdev/omap2/Kconfig b/drivers/video/fbdev/omap2/Kconfig index c22955d2de9a..7fbdb583de8c 100644 --- a/drivers/video/fbdev/omap2/Kconfig +++ b/drivers/video/fbdev/omap2/Kconfig @@ -1,6 +1,3 @@ -config OMAP2_VRFB - bool - if ARCH_OMAP2PLUS source "drivers/video/fbdev/omap2/dss/Kconfig" diff --git a/drivers/video/fbdev/omap2/Makefile b/drivers/video/fbdev/omap2/Makefile index c73a1e864ae8..a52b716a40c1 100644 --- a/drivers/video/fbdev/omap2/Makefile +++ b/drivers/video/fbdev/omap2/Makefile @@ -1,5 +1,3 @@ -obj-$(CONFIG_OMAP2_VRFB) += vrfb.o - obj-y += dss/ obj-y += displays-new/ obj-y += omapfb/ diff --git a/drivers/video/fbdev/omap2/omapfb/Kconfig b/drivers/video/fbdev/omap2/omapfb/Kconfig index 13d99a9e6198..e6226aeed17e 100644 --- a/drivers/video/fbdev/omap2/omapfb/Kconfig +++ b/drivers/video/fbdev/omap2/omapfb/Kconfig @@ -1,3 +1,6 @@ +config OMAP2_VRFB + bool + menuconfig FB_OMAP2 tristate "OMAP2+ frame buffer support" depends on FB diff --git a/drivers/video/fbdev/omap2/omapfb/Makefile b/drivers/video/fbdev/omap2/omapfb/Makefile index 0490951f95b3..ad68ecf141af 100644 --- a/drivers/video/fbdev/omap2/omapfb/Makefile +++ b/drivers/video/fbdev/omap2/omapfb/Makefile @@ -1,3 +1,4 @@ +obj-$(CONFIG_OMAP2_VRFB) += vrfb.o obj-y += dss/ obj-y += displays/ obj-$(CONFIG_FB_OMAP2) += omapfb.o