From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Date: Wed, 13 Nov 2019 01:49:19 +0000 Subject: [PATCH AUTOSEL 4.19 143/209] fbdev: fix broken menu dependencies Message-Id: <20191113015025.9685-143-sashal@kernel.org> List-Id: References: <20191113015025.9685-1-sashal@kernel.org> In-Reply-To: <20191113015025.9685-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-fbdev@vger.kernel.org, Alexander Shiyan , Bartlomiej Zolnierkiewicz , Daniel Vetter , Randy Dunlap , dri-devel@lists.freedesktop.org, Ezequiel Garcia From: Randy Dunlap [ Upstream commit aae3394ef0ef90cf00a21133357448385f13a5d4 ] The framebuffer options and devices menu is unintentionally split or broken because some items in it do not depend on FB (including several under omap and mmp). Fix this by moving FB_CMDLINE, FB_NOTIFY, and FB_CLPS711X_OLD to just before the FB Kconfig symbol definition and by moving the omap, omap2, and mmp menus to last, following FB_SM712. Also, the FB_VIA dependencies are duplicated by both being inside an "if FB_VIA/endif" block and "depends on FB_VIA", so drop the "depends on FB_VIA" lines since they are redundant. Fixes: ea6763c104c9 ("video/fbdev: Always built-in video= cmdline parsing") Fixes: 5ec9653806ba ("fbdev: Make fb-notify a no-op if CONFIG_FB=n") Fixes: ef74d46a4ef3 ("video: clps711x: Add new Cirrus Logic CLPS711X framebuffer driver") Signed-off-by: Randy Dunlap Cc: Ezequiel Garcia Cc: Daniel Vetter Cc: Alexander Shiyan Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/Kconfig | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 591a13a597874..f99558d006bf4 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2,6 +2,18 @@ # fbdev configuration # +config FB_CMDLINE + bool + +config FB_NOTIFY + bool + +config FB_CLPS711X_OLD + tristate + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + menuconfig FB tristate "Support for frame buffer devices" select FB_CMDLINE @@ -54,12 +66,6 @@ config FIRMWARE_EDID combination with certain motherboards and monitors are known to suffer from this problem. -config FB_CMDLINE - bool - -config FB_NOTIFY - bool - config FB_DDC tristate depends on FB @@ -329,12 +335,6 @@ config FB_ACORN hardware found in Acorn RISC PCs and other ARM-based machines. If unsure, say N. -config FB_CLPS711X_OLD - tristate - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - config FB_CLPS711X tristate "CLPS711X LCD support" depends on FB && (ARCH_CLPS711X || COMPILE_TEST) @@ -1456,7 +1456,6 @@ if FB_VIA config FB_VIA_DIRECT_PROCFS bool "direct hardware access via procfs (DEPRECATED)(DANGEROUS)" - depends on FB_VIA default n help Allow direct hardware access to some output registers via procfs. @@ -1466,7 +1465,6 @@ config FB_VIA_DIRECT_PROCFS config FB_VIA_X_COMPATIBILITY bool "X server compatibility" - depends on FB_VIA default n help This option reduces the functionality (power saving, ...) of the @@ -2308,10 +2306,6 @@ config FB_SIMPLE Configuration re: surface address, size, and format must be provided through device tree, or plain old platform data. -source "drivers/video/fbdev/omap/Kconfig" -source "drivers/video/fbdev/omap2/Kconfig" -source "drivers/video/fbdev/mmp/Kconfig" - config FB_SSD1307 tristate "Solomon SSD1307 framebuffer support" depends on FB && I2C @@ -2341,3 +2335,7 @@ config FB_SM712 This driver is also available as a module. The module will be called sm712fb. If you want to compile it as a module, say M here and read . + +source "drivers/video/fbdev/omap/Kconfig" +source "drivers/video/fbdev/omap2/Kconfig" +source "drivers/video/fbdev/mmp/Kconfig" -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 143/209] fbdev: fix broken menu dependencies Date: Tue, 12 Nov 2019 20:49:19 -0500 Message-ID: <20191113015025.9685-143-sashal@kernel.org> References: <20191113015025.9685-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id E99D26EC4E for ; Wed, 13 Nov 2019 01:54:23 +0000 (UTC) In-Reply-To: <20191113015025.9685-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-fbdev@vger.kernel.org, Alexander Shiyan , Bartlomiej Zolnierkiewicz , Daniel Vetter , Randy Dunlap , dri-devel@lists.freedesktop.org, Ezequiel Garcia List-Id: dri-devel@lists.freedesktop.org RnJvbTogUmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+CgpbIFVwc3RyZWFtIGNv bW1pdCBhYWUzMzk0ZWYwZWY5MGNmMDBhMjExMzMzNTc0NDgzODVmMTNhNWQ0IF0KClRoZSBmcmFt ZWJ1ZmZlciBvcHRpb25zIGFuZCBkZXZpY2VzIG1lbnUgaXMgdW5pbnRlbnRpb25hbGx5IHNwbGl0 Cm9yIGJyb2tlbiBiZWNhdXNlIHNvbWUgaXRlbXMgaW4gaXQgZG8gbm90IGRlcGVuZCBvbiBGQiAo aW5jbHVkaW5nCnNldmVyYWwgdW5kZXIgb21hcCBhbmQgbW1wKS4KRml4IHRoaXMgYnkgbW92aW5n IEZCX0NNRExJTkUsIEZCX05PVElGWSwgYW5kIEZCX0NMUFM3MTFYX09MRCB0bwpqdXN0IGJlZm9y ZSB0aGUgRkIgS2NvbmZpZyBzeW1ib2wgZGVmaW5pdGlvbiBhbmQgYnkgbW92aW5nIHRoZQpvbWFw LCBvbWFwMiwgYW5kIG1tcCBtZW51cyB0byBsYXN0LCBmb2xsb3dpbmcgRkJfU003MTIuCgpBbHNv LCB0aGUgRkJfVklBIGRlcGVuZGVuY2llcyBhcmUgZHVwbGljYXRlZCBieSBib3RoIGJlaW5nIGlu c2lkZQphbiAiaWYgRkJfVklBL2VuZGlmIiBibG9jayBhbmQgImRlcGVuZHMgb24gRkJfVklBIiwg c28gZHJvcCB0aGUKImRlcGVuZHMgb24gRkJfVklBIiBsaW5lcyBzaW5jZSB0aGV5IGFyZSByZWR1 bmRhbnQuCgpGaXhlczogZWE2NzYzYzEwNGM5ICgidmlkZW8vZmJkZXY6IEFsd2F5cyBidWlsdC1p biB2aWRlbz0gY21kbGluZSBwYXJzaW5nIikKRml4ZXM6IDVlYzk2NTM4MDZiYSAoImZiZGV2OiBN YWtlIGZiLW5vdGlmeSBhIG5vLW9wIGlmIENPTkZJR19GQj1uIikKRml4ZXM6IGVmNzRkNDZhNGVm MyAoInZpZGVvOiBjbHBzNzExeDogQWRkIG5ldyBDaXJydXMgTG9naWMgQ0xQUzcxMVggZnJhbWVi dWZmZXIgZHJpdmVyIikKClNpZ25lZC1vZmYtYnk6IFJhbmR5IER1bmxhcCA8cmR1bmxhcEBpbmZy YWRlYWQub3JnPgpDYzogRXplcXVpZWwgR2FyY2lhIDxlemVxdWllbEB2YW5ndWFyZGlhc3VyLmNv bS5hcj4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBBbGV4 YW5kZXIgU2hpeWFuIDxzaGNfd29ya0BtYWlsLnJ1PgpTaWduZWQtb2ZmLWJ5OiBCYXJ0bG9taWVq IFpvbG5pZXJraWV3aWN6IDxiLnpvbG5pZXJraWVAc2Ftc3VuZy5jb20+ClNpZ25lZC1vZmYtYnk6 IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL3ZpZGVvL2ZiZGV2 L0tjb25maWcgfCAzNCArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy92aWRlby9mYmRldi9LY29uZmlnIGIvZHJpdmVycy92aWRlby9mYmRldi9LY29uZmln CmluZGV4IDU5MWExM2E1OTc4NzQuLmY5OTU1OGQwMDZiZjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv dmlkZW8vZmJkZXYvS2NvbmZpZworKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L0tjb25maWcKQEAg LTIsNiArMiwxOCBAQAogIyBmYmRldiBjb25maWd1cmF0aW9uCiAjCiAKK2NvbmZpZyBGQl9DTURM SU5FCisJYm9vbAorCitjb25maWcgRkJfTk9USUZZCisJYm9vbAorCitjb25maWcgRkJfQ0xQUzcx MVhfT0xECisJdHJpc3RhdGUKKwlzZWxlY3QgRkJfQ0ZCX0ZJTExSRUNUCisJc2VsZWN0IEZCX0NG Ql9DT1BZQVJFQQorCXNlbGVjdCBGQl9DRkJfSU1BR0VCTElUCisKIG1lbnVjb25maWcgRkIKIAl0 cmlzdGF0ZSAiU3VwcG9ydCBmb3IgZnJhbWUgYnVmZmVyIGRldmljZXMiCiAJc2VsZWN0IEZCX0NN RExJTkUKQEAgLTU0LDEyICs2Niw2IEBAIGNvbmZpZyBGSVJNV0FSRV9FRElECiAJIGNvbWJpbmF0 aW9uIHdpdGggY2VydGFpbiBtb3RoZXJib2FyZHMgYW5kIG1vbml0b3JzIGFyZSBrbm93biB0bwog CSBzdWZmZXIgZnJvbSB0aGlzIHByb2JsZW0uCiAKLWNvbmZpZyBGQl9DTURMSU5FCi0JYm9vbAot Ci1jb25maWcgRkJfTk9USUZZCi0JYm9vbAotCiBjb25maWcgRkJfRERDCiAgICAgICAgdHJpc3Rh dGUKICAgICAgICBkZXBlbmRzIG9uIEZCCkBAIC0zMjksMTIgKzMzNSw2IEBAIGNvbmZpZyBGQl9B Q09STgogCSAgaGFyZHdhcmUgZm91bmQgaW4gQWNvcm4gUklTQyBQQ3MgYW5kIG90aGVyIEFSTS1i YXNlZCBtYWNoaW5lcy4gIElmCiAJICB1bnN1cmUsIHNheSBOLgogCi1jb25maWcgRkJfQ0xQUzcx MVhfT0xECi0JdHJpc3RhdGUKLQlzZWxlY3QgRkJfQ0ZCX0ZJTExSRUNUCi0Jc2VsZWN0IEZCX0NG Ql9DT1BZQVJFQQotCXNlbGVjdCBGQl9DRkJfSU1BR0VCTElUCi0KIGNvbmZpZyBGQl9DTFBTNzEx WAogCXRyaXN0YXRlICJDTFBTNzExWCBMQ0Qgc3VwcG9ydCIKIAlkZXBlbmRzIG9uIEZCICYmIChB UkNIX0NMUFM3MTFYIHx8IENPTVBJTEVfVEVTVCkKQEAgLTE0NTYsNyArMTQ1Niw2IEBAIGlmIEZC X1ZJQQogCiBjb25maWcgRkJfVklBX0RJUkVDVF9QUk9DRlMKIAlib29sICJkaXJlY3QgaGFyZHdh cmUgYWNjZXNzIHZpYSBwcm9jZnMgKERFUFJFQ0FURUQpKERBTkdFUk9VUykiCi0JZGVwZW5kcyBv biBGQl9WSUEKIAlkZWZhdWx0IG4KIAloZWxwCiAJICBBbGxvdyBkaXJlY3QgaGFyZHdhcmUgYWNj ZXNzIHRvIHNvbWUgb3V0cHV0IHJlZ2lzdGVycyB2aWEgcHJvY2ZzLgpAQCAtMTQ2Niw3ICsxNDY1 LDYgQEAgY29uZmlnIEZCX1ZJQV9ESVJFQ1RfUFJPQ0ZTCiAKIGNvbmZpZyBGQl9WSUFfWF9DT01Q QVRJQklMSVRZCiAJYm9vbCAiWCBzZXJ2ZXIgY29tcGF0aWJpbGl0eSIKLQlkZXBlbmRzIG9uIEZC X1ZJQQogCWRlZmF1bHQgbgogCWhlbHAKIAkgIFRoaXMgb3B0aW9uIHJlZHVjZXMgdGhlIGZ1bmN0 aW9uYWxpdHkgKHBvd2VyIHNhdmluZywgLi4uKSBvZiB0aGUKQEAgLTIzMDgsMTAgKzIzMDYsNiBA QCBjb25maWcgRkJfU0lNUExFCiAJICBDb25maWd1cmF0aW9uIHJlOiBzdXJmYWNlIGFkZHJlc3Ms IHNpemUsIGFuZCBmb3JtYXQgbXVzdCBiZSBwcm92aWRlZAogCSAgdGhyb3VnaCBkZXZpY2UgdHJl ZSwgb3IgcGxhaW4gb2xkIHBsYXRmb3JtIGRhdGEuCiAKLXNvdXJjZSAiZHJpdmVycy92aWRlby9m YmRldi9vbWFwL0tjb25maWciCi1zb3VyY2UgImRyaXZlcnMvdmlkZW8vZmJkZXYvb21hcDIvS2Nv bmZpZyIKLXNvdXJjZSAiZHJpdmVycy92aWRlby9mYmRldi9tbXAvS2NvbmZpZyIKLQogY29uZmln IEZCX1NTRDEzMDcKIAl0cmlzdGF0ZSAiU29sb21vbiBTU0QxMzA3IGZyYW1lYnVmZmVyIHN1cHBv cnQiCiAJZGVwZW5kcyBvbiBGQiAmJiBJMkMKQEAgLTIzNDEsMyArMjMzNSw3IEBAIGNvbmZpZyBG Ql9TTTcxMgogCSAgVGhpcyBkcml2ZXIgaXMgYWxzbyBhdmFpbGFibGUgYXMgYSBtb2R1bGUuIFRo ZSBtb2R1bGUgd2lsbCBiZQogCSAgY2FsbGVkIHNtNzEyZmIuIElmIHlvdSB3YW50IHRvIGNvbXBp bGUgaXQgYXMgYSBtb2R1bGUsIHNheSBNCiAJICBoZXJlIGFuZCByZWFkIDxmaWxlOkRvY3VtZW50 YXRpb24va2J1aWxkL21vZHVsZXMudHh0Pi4KKworc291cmNlICJkcml2ZXJzL3ZpZGVvL2ZiZGV2 L29tYXAvS2NvbmZpZyIKK3NvdXJjZSAiZHJpdmVycy92aWRlby9mYmRldi9vbWFwMi9LY29uZmln Igorc291cmNlICJkcml2ZXJzL3ZpZGVvL2ZiZGV2L21tcC9LY29uZmlnIgotLSAKMi4yMC4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19DFCC43331 for ; Wed, 13 Nov 2019 02:20:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDC2A2053B for ; Wed, 13 Nov 2019 02:20:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573611640; bh=Pa5fKk6CHyK6RI2MGsaLXHeaFP6X1ftK/j9elCp552A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sBl+VYAMvpDy+xxHCj2tXO25KRJWLrl9+pNdg0MD3LL6ixhumFR+lCT5Z2F/LogE/ dZmNnCfonQzgw5RvURqd2iwZ1HChOqIeNd5go3HDFq+ma8yUQiB5yoBFbbn1mSFKd8 NrM0W2NIRKcZnJuC7V9BkItb/X61L2XO5FSSxgBQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728869AbfKMBy1 (ORCPT ); Tue, 12 Nov 2019 20:54:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:45166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728848AbfKMByY (ORCPT ); Tue, 12 Nov 2019 20:54:24 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C72D420674; Wed, 13 Nov 2019 01:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610063; bh=Pa5fKk6CHyK6RI2MGsaLXHeaFP6X1ftK/j9elCp552A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wKBDy4lsTgrpfaJ7g42DI+nLxT77alvzNTRtWVNGRdyE7Ekf4tK8RvSH4iNEaoB1R tXPISHjaq3N8xqS9FShQjfIGkFtig32ioj1YibJav9ck3h0hHJn6Z4xADnBc2INVW4 Eg3155VnjF70gEsnE1j9JNwwwqhaUcUtlKrvKEmQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Randy Dunlap , Ezequiel Garcia , Daniel Vetter , Alexander Shiyan , Bartlomiej Zolnierkiewicz , Sasha Levin , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 143/209] fbdev: fix broken menu dependencies Date: Tue, 12 Nov 2019 20:49:19 -0500 Message-Id: <20191113015025.9685-143-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015025.9685-1-sashal@kernel.org> References: <20191113015025.9685-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ Upstream commit aae3394ef0ef90cf00a21133357448385f13a5d4 ] The framebuffer options and devices menu is unintentionally split or broken because some items in it do not depend on FB (including several under omap and mmp). Fix this by moving FB_CMDLINE, FB_NOTIFY, and FB_CLPS711X_OLD to just before the FB Kconfig symbol definition and by moving the omap, omap2, and mmp menus to last, following FB_SM712. Also, the FB_VIA dependencies are duplicated by both being inside an "if FB_VIA/endif" block and "depends on FB_VIA", so drop the "depends on FB_VIA" lines since they are redundant. Fixes: ea6763c104c9 ("video/fbdev: Always built-in video= cmdline parsing") Fixes: 5ec9653806ba ("fbdev: Make fb-notify a no-op if CONFIG_FB=n") Fixes: ef74d46a4ef3 ("video: clps711x: Add new Cirrus Logic CLPS711X framebuffer driver") Signed-off-by: Randy Dunlap Cc: Ezequiel Garcia Cc: Daniel Vetter Cc: Alexander Shiyan Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/Kconfig | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 591a13a597874..f99558d006bf4 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2,6 +2,18 @@ # fbdev configuration # +config FB_CMDLINE + bool + +config FB_NOTIFY + bool + +config FB_CLPS711X_OLD + tristate + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT + menuconfig FB tristate "Support for frame buffer devices" select FB_CMDLINE @@ -54,12 +66,6 @@ config FIRMWARE_EDID combination with certain motherboards and monitors are known to suffer from this problem. -config FB_CMDLINE - bool - -config FB_NOTIFY - bool - config FB_DDC tristate depends on FB @@ -329,12 +335,6 @@ config FB_ACORN hardware found in Acorn RISC PCs and other ARM-based machines. If unsure, say N. -config FB_CLPS711X_OLD - tristate - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT - config FB_CLPS711X tristate "CLPS711X LCD support" depends on FB && (ARCH_CLPS711X || COMPILE_TEST) @@ -1456,7 +1456,6 @@ if FB_VIA config FB_VIA_DIRECT_PROCFS bool "direct hardware access via procfs (DEPRECATED)(DANGEROUS)" - depends on FB_VIA default n help Allow direct hardware access to some output registers via procfs. @@ -1466,7 +1465,6 @@ config FB_VIA_DIRECT_PROCFS config FB_VIA_X_COMPATIBILITY bool "X server compatibility" - depends on FB_VIA default n help This option reduces the functionality (power saving, ...) of the @@ -2308,10 +2306,6 @@ config FB_SIMPLE Configuration re: surface address, size, and format must be provided through device tree, or plain old platform data. -source "drivers/video/fbdev/omap/Kconfig" -source "drivers/video/fbdev/omap2/Kconfig" -source "drivers/video/fbdev/mmp/Kconfig" - config FB_SSD1307 tristate "Solomon SSD1307 framebuffer support" depends on FB && I2C @@ -2341,3 +2335,7 @@ config FB_SM712 This driver is also available as a module. The module will be called sm712fb. If you want to compile it as a module, say M here and read . + +source "drivers/video/fbdev/omap/Kconfig" +source "drivers/video/fbdev/omap2/Kconfig" +source "drivers/video/fbdev/mmp/Kconfig" -- 2.20.1