Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0d26c33 authored by Russell King's avatar Russell King
Browse files

PCMCIA: fix pxa2xx_lubbock modular build error 



ERROR: "pxa2xx_drv_pcmcia_ops" [drivers/pcmcia/pxa2xx_lubbock_cs.ko] undefined!
ERROR: "pxa2xx_drv_pcmcia_add_one" [drivers/pcmcia/pxa2xx_lubbock_cs.ko] undefined!

We also remove __pxa2xx_drv_pcmcia_probe and its export, since this is
no longer required.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 053fe57a

drivers/pcmcia/pxa2xx_base.c

+5 −11
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt) 


	return soc_pcmcia_add_one(skt);

}

EXPORT_SYMBOL(pxa2xx_drv_pcmcia_add_one);



void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops)

{
@@ -261,19 +262,19 @@ void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops) 
	ops->frequency_change = pxa2xx_pcmcia_frequency_change;

#endif

}

EXPORT_SYMBOL(pxa2xx_drv_pcmcia_ops);



int __pxa2xx_drv_pcmcia_probe(struct device *dev)

static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)

{

	int i, ret = 0;

	struct pcmcia_low_level *ops;

	struct skt_dev_info *sinfo;

	struct soc_pcmcia_socket *skt;



	if (!dev || !dev->platform_data)

	ops = (struct pcmcia_low_level *)dev->dev.platform_data;

	if (!ops)

		return -ENODEV;



	ops = (struct pcmcia_low_level *)dev->platform_data;



	pxa2xx_drv_pcmcia_ops(ops);



	sinfo = kzalloc(SKT_DEV_INFO_SIZE(ops->nr), GFP_KERNEL);
@@ -308,13 +309,6 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev) 


	return ret;

}

EXPORT_SYMBOL(__pxa2xx_drv_pcmcia_probe);





static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)

{

	return __pxa2xx_drv_pcmcia_probe(&dev->dev);

}



static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)

{

drivers/pcmcia/pxa2xx_base.h

+0 −3
Original line number Diff line number Diff line 
/* temporary measure */

extern int __pxa2xx_drv_pcmcia_probe(struct device *);



int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt);

void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops);