Merge branch 'linus' into x86/urgent

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

diff --git a/drivers/pcmcia/pxa2xx_base.h b/drivers/pcmcia/pxa2xx_base.h
index e46cff345d472bf3d8bb8805c91cf4d54bd36c1e..235d681652c3f625ae31be4b4d592c5bae5ff176 100644 (file)
--- a/drivers/pcmcia/pxa2xx_base.h
+++ b/drivers/pcmcia/pxa2xx_base.h
@@ -1,3 +1,3 @@
 /* temporary measure */
-extern int pxa2xx_drv_pcmcia_probe(struct device *);
+extern int __pxa2xx_drv_pcmcia_probe(struct device *);