Merge head 'drm-via' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[linux-2.6] / drivers / pcmcia / pxa2xx_base.h

/* temporary measure */
extern int pxa2xx_drv_pcmcia_probe(struct device *);