From patchwork Thu Jun 16 11:27:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 886892 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5GBRWtj026638 for ; Thu, 16 Jun 2011 11:27:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755932Ab1FPL1b (ORCPT ); Thu, 16 Jun 2011 07:27:31 -0400 Received: from na3sys009aog111.obsmtp.com ([74.125.149.205]:34632 "EHLO na3sys009aog111.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755456Ab1FPL1a (ORCPT ); Thu, 16 Jun 2011 07:27:30 -0400 Received: from mail-fx0-f41.google.com ([209.85.161.41]) (using TLSv1) by na3sys009aob111.postini.com ([74.125.148.12]) with SMTP ID DSNKTfnooVD/Y+XoVUuayvYBkD0p7bY7v3Xa@postini.com; Thu, 16 Jun 2011 04:27:30 PDT Received: by mail-fx0-f41.google.com with SMTP id 18so1261295fxm.0 for ; Thu, 16 Jun 2011 04:27:29 -0700 (PDT) Received: by 10.223.62.146 with SMTP id x18mr963907fah.54.1308223649523; Thu, 16 Jun 2011 04:27:29 -0700 (PDT) Received: from localhost (cs181221225.pp.htv.fi [82.181.221.225]) by mx.google.com with ESMTPS id e16sm763258fak.17.2011.06.16.04.27.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 16 Jun 2011 04:27:28 -0700 (PDT) From: Felipe Balbi To: Tony Lindgren Cc: Linux OMAP Mailing List , Felipe Balbi Subject: [PATCH 3/4] cbus: Kconfig cleanup Date: Thu, 16 Jun 2011 14:27:17 +0300 Message-Id: <1308223638-9634-3-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.6.rc1 In-Reply-To: <1308223638-9634-1-git-send-email-balbi@ti.com> References: <1308223638-9634-1-git-send-email-balbi@ti.com> Organization: Texas Instruments\n Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 16 Jun 2011 11:27:32 +0000 (UTC) trivial, no functional changes. While at that, also drop the OMAP dependency as there's no need for that. Signed-off-by: Felipe Balbi --- drivers/cbus/Kconfig | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/cbus/Kconfig b/drivers/cbus/Kconfig index d845a7e..938d244 100644 --- a/drivers/cbus/Kconfig +++ b/drivers/cbus/Kconfig @@ -5,7 +5,6 @@ menu "CBUS support" config CBUS - depends on ARCH_OMAP bool "CBUS support on OMAP" ---help--- CBUS is a proprietary serial protocol by Nokia. It is mainly @@ -21,8 +20,10 @@ config CBUS_TAHVO If you want Tahvo support, you should say Y here. +if CBUS_TAHVO + config CBUS_TAHVO_USB - depends on CBUS_TAHVO && USB + depends on USB select USB_OTG_UTILS tristate "Support for Tahvo USB transceiver" ---help--- @@ -35,6 +36,8 @@ config CBUS_TAHVO_USB_HOST_BY_DEFAULT Say Y here, if you want the device to enter USB host mode by default on bootup. +endif # CBUS_TAHVO + config CBUS_RETU depends on CBUS bool "Support for Retu" @@ -43,8 +46,10 @@ config CBUS_RETU If you want Retu support, you should say Y here. +if CBUS_RETU + config CBUS_RETU_POWERBUTTON - depends on CBUS_RETU + depends on INPUT bool "Support for Retu power button" ---help--- The power button on Nokia 770 is connected to the Retu ASIC. @@ -52,25 +57,27 @@ config CBUS_RETU_POWERBUTTON If you want support for the Retu power button, you should say Y here. config CBUS_RETU_RTC - depends on CBUS_RETU && RTC_CLASS + depends on RTC_CLASS tristate "Support for Retu pseudo-RTC" ---help--- Say Y here if you want support for the device that alleges to be an RTC in Retu. This will expose a sysfs interface for it. config CBUS_RETU_WDT - depends on CBUS_RETU && SYSFS && WATCHDOG + depends on SYSFS && WATCHDOG tristate "Support for Retu watchdog timer" ---help--- Say Y here if you want support for the watchdog in Retu. This will expose a sysfs interface to grok it. config CBUS_RETU_HEADSET - depends on CBUS_RETU && SYSFS + depends on SYSFS tristate "Support for headset detection with Retu/Vilma" ---help--- Say Y here if you want support detecting a headset that's connected to Retu/Vilma. Detection state and events are exposed through sysfs. +endif # CBUS_RETU + endmenu