From patchwork Thu May 12 12:42:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 779792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4CCgR3J027811 for ; Thu, 12 May 2011 12:42:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754613Ab1ELMm1 (ORCPT ); Thu, 12 May 2011 08:42:27 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:37632 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752607Ab1ELMm0 convert rfc822-to-8bit (ORCPT ); Thu, 12 May 2011 08:42:26 -0400 Received: from [2001:470:1f08:1539:21c:bfff:fe03:f805] (helo=localhost) by shadbolt.decadent.org.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1QKVDe-0003En-9g; Thu, 12 May 2011 13:42:23 +0100 Received: from ben by localhost with local (Exim 4.75) (envelope-from ) id 1QKVDd-0001IL-Oo; Thu, 12 May 2011 13:42:17 +0100 From: Ben Hutchings To: Paul Mundt Cc: linux-fbdev@vger.kernel.org Date: Thu, 12 May 2011 13:42:17 +0100 Message-ID: <1305204137.4065.394.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.32.3 X-SA-Exim-Connect-IP: 2001:470:1f08:1539:21c:bfff:fe03:f805 X-SA-Exim-Mail-From: ben@decadent.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on shadbolt.decadent.org.uk X-Spam-Level: **** X-Spam-Status: No, score=4.9 required=5.0 tests=FSL_HELO_NON_FQDN_1, HELO_LOCALHOST,RDNS_NONE autolearn=disabled version=3.3.1 Subject: [PATCH] video: mb862xxfb: Require either FB_MB862XX_PCI_GDC or FB_MB862XX_LIME X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:51:10 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 12 May 2011 12:42:27 +0000 (UTC) The driver can be built as either a PCI or platform (OF) driver. It might make sense to built it as both (though that is not currently possible) but it certainly doesn't make sense to build it as neither! Add dependencies and add a choice group to ensure that exactly one of FB_MB862XX_PCI_GDC and FB_MB862XX_LIME is selected. Signed-off-by: Ben Hutchings Acked-by: Anatolij Gustschin --- drivers/video/Kconfig | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 1d0aa5e..eb468f6 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2254,29 +2254,34 @@ config FB_METRONOME config FB_MB862XX tristate "Fujitsu MB862xx GDC support" depends on FB + depends on PCI || (OF && PPC) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT ---help--- Frame buffer driver for Fujitsu Carmine/Coral-P(A)/Lime controllers. +choice + prompt "GDC variant" + depends on FB_MB862XX + config FB_MB862XX_PCI_GDC bool "Carmine/Coral-P(A) GDC" - depends on PCI && FB_MB862XX + depends on PCI ---help--- This enables framebuffer support for Fujitsu Carmine/Coral-P(A) PCI graphics controller devices. config FB_MB862XX_LIME bool "Lime GDC" - depends on FB_MB862XX - depends on OF && !FB_MB862XX_PCI_GDC - depends on PPC + depends on OF && PPC select FB_FOREIGN_ENDIAN select FB_LITTLE_ENDIAN ---help--- Framebuffer support for Fujitsu Lime GDC on host CPU bus. +endchoice + config FB_EP93XX tristate "EP93XX frame buffer support" depends on FB && ARCH_EP93XX