From patchwork Wed Jul 28 22:04:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 114922 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6SMDseP025438 for ; Wed, 28 Jul 2010 22:13:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756559Ab0G1WNl (ORCPT ); Wed, 28 Jul 2010 18:13:41 -0400 Received: from tichy.grunau.be ([85.131.189.73]:38701 "EHLO tichy.grunau.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756551Ab0G1WNk (ORCPT ); Wed, 28 Jul 2010 18:13:40 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 28 Jul 2010 22:13:55 +0000 (UTC) X-Greylist: delayed 565 seconds by postgrey-1.27 at vger.kernel.org; Wed, 28 Jul 2010 18:13:39 EDT Received: from localhost (p5DDC480E.dip0.t-ipconnect.de [93.220.72.14]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tichy.grunau.be (Postfix) with ESMTPSA id 5087590057; Thu, 29 Jul 2010 00:02:42 +0200 (CEST) Date: Thu, 29 Jul 2010 00:04:55 +0200 From: Janne Grunau To: Randy Dunlap Cc: Stephen Rothwell , lirc-list@lists.sourceforge.net, Jarod Wilson , linux-next@vger.kernel.org, LKML , Maxim Levitsky , linux-media@vger.kernel.org, Mauro Carvalho Chehab Subject: Re: linux-next: Tree for July 28 (lirc #2) Message-ID: <20100728220454.GK8564@aniel.lan> References: <20100728162855.4968e561.sfr@canb.auug.org.au> <20100728102417.be60049a.randy.dunlap@oracle.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100728102417.be60049a.randy.dunlap@oracle.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig index 968c2ade..3981a4a 100644 --- a/drivers/staging/lirc/Kconfig +++ b/drivers/staging/lirc/Kconfig @@ -13,13 +13,13 @@ if LIRC_STAGING config LIRC_BT829 tristate "BT829 based hardware" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for the IR interface on BT829-based hardware config LIRC_ENE0100 tristate "ENE KB3924/ENE0100 CIR Port Reciever" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help This is a driver for CIR port handled by ENE KB3924 embedded controller found on some notebooks. @@ -27,20 +27,20 @@ config LIRC_ENE0100 config LIRC_I2C tristate "I2C Based IR Receivers" - depends on LIRC_STAGING + depends on I2C && LIRC && LIRC_STAGING help Driver for I2C-based IR receivers, such as those commonly found onboard Hauppauge PVR-150/250/350 video capture cards config LIRC_IGORPLUGUSB tristate "Igor Cesko's USB IR Receiver" - depends on LIRC_STAGING && USB + depends on USB && LIRC && LIRC_STAGING && USB help Driver for Igor Cesko's USB IR Receiver config LIRC_IMON tristate "Legacy SoundGraph iMON Receiver and Display" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for the original SoundGraph iMON IR Receiver and Display @@ -48,31 +48,31 @@ config LIRC_IMON config LIRC_IT87 tristate "ITE IT87XX CIR Port Receiver" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for the ITE IT87xx IR Receiver config LIRC_ITE8709 tristate "ITE8709 CIR Port Receiver" - depends on LIRC_STAGING && PNP + depends on LIRC && LIRC_STAGING && PNP help Driver for the ITE8709 IR Receiver config LIRC_PARALLEL tristate "Homebrew Parallel Port Receiver" - depends on LIRC_STAGING && !SMP + depends on LIRC && LIRC_STAGING && !SMP help Driver for Homebrew Parallel Port Receivers config LIRC_SASEM tristate "Sasem USB IR Remote" - depends on LIRC_STAGING + depends on USB && LIRC && LIRC_STAGING help Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module config LIRC_SERIAL tristate "Homebrew Serial Port Receiver" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for Homebrew Serial Port Receivers @@ -85,25 +85,25 @@ config LIRC_SERIAL_TRANSMITTER config LIRC_SIR tristate "Built-in SIR IrDA port" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for the SIR IrDA port config LIRC_STREAMZAP tristate "Streamzap PC Receiver" - depends on LIRC_STAGING + depends on USB && LIRC && LIRC_STAGING help Driver for the Streamzap PC Receiver config LIRC_TTUSBIR tristate "Technotrend USB IR Receiver" - depends on LIRC_STAGING && USB + depends on USB && LIRC && LIRC_STAGING && USB help Driver for the Technotrend USB IR Receiver config LIRC_ZILOG tristate "Zilog/Hauppauge IR Transmitter" - depends on LIRC_STAGING + depends on I2C && LIRC && LIRC_STAGING help Driver for the Zilog/Hauppauge IR Transmitter, found on PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards