From patchwork Thu Jan 7 21:07:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 71652 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o07L8GD7012381 for ; Thu, 7 Jan 2010 21:08:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753579Ab0AGVHs (ORCPT ); Thu, 7 Jan 2010 16:07:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753102Ab0AGVHs (ORCPT ); Thu, 7 Jan 2010 16:07:48 -0500 Received: from cantor2.suse.de ([195.135.220.15]:56289 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751799Ab0AGVHr (ORCPT ); Thu, 7 Jan 2010 16:07:47 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 2743A8655F; Thu, 7 Jan 2010 22:07:45 +0100 (CET) Received: by sepie.suse.cz (Postfix, from userid 10020) id 12F817640F; Thu, 7 Jan 2010 22:07:45 +0100 (CET) Date: Thu, 7 Jan 2010 22:07:44 +0100 From: Michal Marek To: Dominik Brodowski Cc: Randy Dunlap , Stephen Rothwell , linux-kbuild@vger.kernel.org, linux-next@vger.kernel.org, LKML , Valdis.Kletnieks@vt.edu Subject: Re: linux-next: Tree for January 7 (pcmcia) Message-ID: <20100107210744.GA10320@sepie.suse.cz> References: <20100107172134.af71c742.sfr@canb.auug.org.au> <20100107101006.e59989a8.rdunlap@xenotime.net> <20100107205728.GA19115@isilmar.linta.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100107205728.GA19115@isilmar.linta.de> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 5cea8ba..e196a19 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -84,7 +84,7 @@ config YENTA tristate "CardBus yenta-compatible bridge support" depends on PCI select CARDBUS if !EMBEDDED - select PCCARD_NONSTATIC if PCMCIA + select PCCARD_NONSTATIC if PCMCIA != n ---help--- This option enables support for CardBus host bridges. Virtually all modern PCMCIA bridges are CardBus compatible. A "bridge" is