Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git...

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

diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 95425f3d22209291620bc57cb2646885f2b71acf..5569a522e2a13c998f305c730c361d0809a0d8f4 100644 (file)
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -48,8 +48,6 @@
 #include <linux/pci.h>
 #include <linux/isapnp.h>
 
-extern const char *CardType[];
-
 static const char *Sedlbauer_revision = "$Revision: 1.34.2.6 $";
 
 static const char *Sedlbauer_Types[] =
@@ -555,7 +553,7 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
                                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);