From patchwork Fri Jan 8 17:54:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominik Brodowski X-Patchwork-Id: 71851 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 o08IMX1T026576 for ; Fri, 8 Jan 2010 18:22:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752404Ab0AHSWd (ORCPT ); Fri, 8 Jan 2010 13:22:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753323Ab0AHSWd (ORCPT ); Fri, 8 Jan 2010 13:22:33 -0500 Received: from isilmar.linta.de ([213.133.102.198]:36089 "EHLO linta.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751690Ab0AHSWb (ORCPT ); Fri, 8 Jan 2010 13:22:31 -0500 Received: (qmail 4686 invoked from network); 8 Jan 2010 18:22:29 -0000 Received: from p54a05305.dip.t-dialin.net (HELO comet.dominikbrodowski.net) (brodo@84.160.83.5) by isilmar.linta.de with (DHE-RSA-AES256-SHA encrypted) SMTP; 8 Jan 2010 18:22:29 -0000 Received: by comet.dominikbrodowski.net (Postfix, from userid 1000) id 0A19180084; Fri, 8 Jan 2010 18:54:23 +0100 (CET) Date: Fri, 8 Jan 2010 18:54:23 +0100 From: Dominik Brodowski To: Randy Dunlap Cc: Michal Marek , 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: <20100108175423.GA29713@comet.dominikbrodowski.net> Mail-Followup-To: Dominik Brodowski , Randy Dunlap , Michal Marek , Stephen Rothwell , linux-kbuild@vger.kernel.org, linux-next@vger.kernel.org, LKML , Valdis.Kletnieks@vt.edu References: <20100107172134.af71c742.sfr@canb.auug.org.au> <20100107101006.e59989a8.rdunlap@xenotime.net> <20100107205728.GA19115@isilmar.linta.de> <20100107210744.GA10320@sepie.suse.cz> <20100107135557.989c9585.rdunlap@xenotime.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100107135557.989c9585.rdunlap@xenotime.net> 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 efc51b9..e8f35da 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 @@ -161,8 +161,8 @@ config TCIC config PCMCIA_M8XX tristate "MPC8xx PCMCIA support" - depends on PCMCIA && PPC && 8xx - select PCCARD_IODYN if PCMCIA + depends on PCCARD && PPC && 8xx + select PCCARD_IODYN if PCMCIA != n help Say Y here to include support for PowerPC 8xx series PCMCIA controller.