Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / drivers / isdn / hisax / avm_pci.c

diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 0f1db1f669b28028162fcf205bb69c5bd4749359..7cabc5a19492457e96d5de130f63c9ca352202b3 100644 (file)
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -797,7 +797,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs)
                        err = pnp_activate_dev(pnp_avm_d);
                        if (err<0) {
                                printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                       __FUNCTION__, err);
+                                       __func__, err);
                                return(0);
                        }
                        cs->hw.avm.cfg_reg =