From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Marek Subject: Re: linux-next: Tree for January 7 (pcmcia) Date: Fri, 08 Jan 2010 20:24:43 +0100 Message-ID: <4B47867B.4080700@suse.cz> 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> <20100108175423.GA29713@comet.dominikbrodowski.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20100108175423.GA29713@comet.dominikbrodowski.net> Sender: linux-kbuild-owner@vger.kernel.org To: Dominik Brodowski Cc: Randy Dunlap , Stephen Rothwell , linux-kbuild@vger.kernel.org, linux-next@vger.kernel.org, LKML , Valdis.Kletnieks@vt.edu List-Id: linux-next.vger.kernel.org Dominik Brodowski wrote: > From 77f9eb4599f1d0f5a43cadece9809018b534e308 Mon Sep 17 00:00:00 2001 > From: Michal Marek > Date: Thu, 7 Jan 2010 21:03:11 +0100 > Subject: [PATCH] pcmcia: fix yenta dependency on PCCARD_NONSTATIC > > With CONFIG_PCMCIA=m and CONFIG_YENTA=y, we get > > drivers/built-in.o: In function `yenta_probe': > yenta_socket.c:(.devinit.text+0x1e582): undefined reference to > `pccard_nonstatic_ops' > > This is because > > select PCCARD_NONSTATIC if PCMCIA > > sets PCCARD_NONSTATIC = min(YENTA, PCMCIA). Change it to 'if PCMCIA!=n' > to remove the upper limit. > > [linux@dominikbrodowski.net: propagate change to PCMICA_M8XX] > Reported-by: Randy Dunlap > Signed-off-by: Michal Marek > Acked-by: Randy Dunlap > Signed-off-by: Dominik Brodowski > > 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 PCCARD_IODYN is bool, so this change is not necessary (but doesn't do any harm either). Michal