Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750807AbWAEAMJ (ORCPT ); Wed, 4 Jan 2006 19:12:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750812AbWAEAMJ (ORCPT ); Wed, 4 Jan 2006 19:12:09 -0500 Received: from wproxy.gmail.com ([64.233.184.203]:22049 "EHLO wproxy.gmail.com") by vger.kernel.org with ESMTP id S1750807AbWAEAMI (ORCPT ); Wed, 4 Jan 2006 19:12:08 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:subject:from:to:cc:in-reply-to:references:content-type:date:message-id:mime-version:x-mailer:content-transfer-encoding; b=OUqPv9h9xIvOsTgAjepQ2k8rw+hs+MxEm2lon2B8jqrzqogCYq8H8ZkE/i9XjWg8SBGQqm4a87Uo1cJd+AKtjrlP5GOLhJp4xueRzeSskuAQv5FLd9nwjup8W6wufPsPzkCvXZgOPOq/D27J9WC01bPsh4izLqOQItO1YTBUQCA= Subject: Re: [PATCH] PXA2xx: build PCMCIA as a module From: Florin Malita To: Richard Purdie Cc: rmk+lkml@arm.linux.org.uk, linux-kernel@vger.kernel.org In-Reply-To: <1136413220.9902.94.camel@localhost.localdomain> References: <1136409389.14442.20.camel@scox.glenatl.glenayre.com> <1136413220.9902.94.camel@localhost.localdomain> Content-Type: text/plain Date: Wed, 04 Jan 2006 19:12:53 -0500 Message-Id: <1136419973.2768.7.camel@zed.malinux.net> Mime-Version: 1.0 X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1861 Lines: 57 On Wed, 2006-01-04 at 22:20 +0000, Richard Purdie wrote: > NAK. This breaks poodle, tosa and collie who also use scoop and this > pcmcia driver. I'd suggest moving scoop_pcmcia_config to > arch/arm/common/scoop.c instead. Breaking collies is not exactly at the top of my todo list :) So how about this then: Signed-off-by: Florin Malita -- diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -19,6 +19,10 @@ #define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr))) +/* PCMCIA to Scoop linkage */ +struct scoop_pcmcia_config *platform_scoop_config; +EXPORT_SYMBOL(platform_scoop_config); + struct scoop_dev { void *base; spinlock_t scoop_lock; diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -27,13 +27,6 @@ #define NO_KEEP_VS 0x0001 -/* PCMCIA to Scoop linkage - - There is no easy way to link multiple scoop devices into one - single entity for the pxa2xx_pcmcia device so this structure - is used which is setup by the platform code -*/ -struct scoop_pcmcia_config *platform_scoop_config; #define SCOOP_DEV platform_scoop_config->devs static void sharpsl_pcmcia_init_reset(struct scoop_pcmcia_dev *scoopdev) diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -846,3 +846,4 @@ int soc_common_drv_pcmcia_remove(struct return 0; } +EXPORT_SYMBOL(soc_common_drv_pcmcia_remove); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/