diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 19:39:35 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 19:39:35 +0000 |
commit | fc7736688b046f91170591625b38f12a839ba994 (patch) | |
tree | e7198a9fabfcea785cbb16375455dbdb6aa9871b /drivers/pcmcia/pxa2xx_base.h | |
parent | bc7ecbcbc2c0ff235382077b55de7896775afc16 (diff) | |
parent | 9074e144c10cba5d6bb6b326a8be5347d38e4473 (diff) |
Merge branch 'master' into devel
Diffstat (limited to 'drivers/pcmcia/pxa2xx_base.h')
-rw-r--r-- | drivers/pcmcia/pxa2xx_base.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.h b/drivers/pcmcia/pxa2xx_base.h index cb5efaec886f..bb62ea87b8f9 100644 --- a/drivers/pcmcia/pxa2xx_base.h +++ b/drivers/pcmcia/pxa2xx_base.h @@ -1,6 +1,3 @@ -/* 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); |