Messages in this thread | | | Subject | Re: [PATCH] PXA2xx: build PCMCIA as a module | From | Richard Purdie <> | Date | Thu, 05 Jan 2006 15:52:03 +0000 |
| |
On Thu, 2006-01-05 at 09:17 -0500, Florin Malita wrote: > > 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. > > Here's a version with the modified comment following your suggestion. > > Thanks, > Florin > > Signed-off-by: Florin Malita <fmalita@gmail.com> Signed-off-by: Richard Purdie <rpurdie@rpsys.net> > -- > 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,16 @@ > > #define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr))) > > +/* 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 and used by the > + pcmcia driver. > +*/ > +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/
| |