From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758518Ab1LOBSv (ORCPT ); Wed, 14 Dec 2011 20:18:51 -0500 Received: from toronto-hs-216-138-233-67.s-ip.magma.ca ([216.138.233.67]:54467 "HELO yow.seanm.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1758505Ab1LOBSt (ORCPT ); Wed, 14 Dec 2011 20:18:49 -0500 Date: Wed, 14 Dec 2011 20:18:44 -0500 From: Sean MacLennan To: Sean MacLennan Cc: Randy Dunlap , Stephen Rothwell , "devel@driverdev.osuosl.org" , linux-next@vger.kernel.org, LKML Subject: [PATCH] linux-next: Tree for Dec 12 (staging/rtl8192e) Message-ID: <20111214201844.60cf5fe5@opus.seanm.ca> In-Reply-To: <20111213233939.572235ff@opus.seanm.ca> References: <20111212161444.22a11535656c6bfbd884d9ec@canb.auug.org.au> <4EE63A9C.1090503@xenotime.net> <20111213233939.572235ff@opus.seanm.ca> X-Mailer: Claws Mail 3.7.10 (GTK+ 2.24.4; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The rtllib and rtllib_crypt drivers are both required for a fully functional rtllib. Make sure both are always available by having rtllib select rtllib_crypt. Signed-off-by: Sean MacLennan --- This patch is against linux-next. drivers/staging/rtl8192e/Kconfig | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8192e/Kconfig b/drivers/staging/rtl8192e/Kconfig index a24305d..878f384 100644 --- a/drivers/staging/rtl8192e/Kconfig +++ b/drivers/staging/rtl8192e/Kconfig @@ -2,6 +2,7 @@ config RTLLIB tristate "Support for rtllib wireless devices" depends on WLAN && m default n + select RTLLIB_CRYPTO ---help--- If you have a wireless card that uses rtllib, say Y. Currently the only card is the rtl8192e. @@ -12,16 +13,12 @@ if RTLLIB config RTLLIB_CRYPTO tristate "Support for rtllib crypto support" - depends on RTLLIB - default y ---help--- - CCMP crypto driver for rtllib. - - If you enabled RTLLIB, you want this. + Base crypto driver for rtllib. config RTLLIB_CRYPTO_CCMP tristate "Support for rtllib CCMP crypto" - depends on RTLLIB && RTLLIB_CRYPTO + depends on RTLLIB_CRYPTO default y ---help--- CCMP crypto driver for rtllib. @@ -30,7 +27,7 @@ config RTLLIB_CRYPTO_CCMP config RTLLIB_CRYPTO_TKIP tristate "Support for rtllib TKIP crypto" - depends on RTLLIB && RTLLIB_CRYPTO + depends on RTLLIB_CRYPTO default y ---help--- TKIP crypto driver for rtllib. @@ -39,7 +36,7 @@ config RTLLIB_CRYPTO_TKIP config RTLLIB_CRYPTO_WEP tristate "Support for rtllib WEP crypto" - depends on RTLLIB && RTLLIB_CRYPTO + depends on RTLLIB_CRYPTO default y ---help--- TKIP crypto driver for rtllib.