Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6] / drivers / pcmcia / pxa2xx_base.h
1 /* temporary measure */
2 extern int pxa2xx_drv_pcmcia_probe(struct device *);
3