Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / isdn / hisax / ix1_micro.c

diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 2d18d4f1e57e8f35d15dc388c3448a526a621226..a92bf0d2cab2e6821f940c54221f99223b448d39 100644 (file)
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -252,7 +252,7 @@ setup_ix1micro(struct IsdnCard *card)
                                        err = pnp_activate_dev(pnp_d);
                                        if (err<0) {
                                                printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                       __FUNCTION__, err);
+                                                       __func__, err);
                                                return(0);
                                        }
                                        card->para[1] = pnp_port_start(pnp_d, 0);