Merge ARM fixes

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

diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 3dacfff93f5fb6c51ff0c873278f800bfed9c8e6..6eebeb441bfd1ec7482a9b42bbdfd198c65acf86 100644 (file)
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -1121,7 +1121,11 @@ setup_diva(struct IsdnCard *card)
                        bytecnt = 32;
                }
        }
+
+#ifdef __ISAPNP__
 ready:
+#endif
+
        printk(KERN_INFO
                "Diva: %s card configured at %#lx IRQ %d\n",
                (cs->subtyp == DIVA_PCI) ? "PCI" :