Merge branch 'x86/iommu' into x86/core

[~andy/linux] / drivers / isdn / hisax / diva.c

diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 2d670856d141bcb0a9668faabba046ca40d0a9f7..018bd293e580829a499bb4929f7513a23801907e 100644 (file)
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -1088,7 +1088,7 @@ static int __devinit setup_diva_isapnp(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);