Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 2b54e7d..b0ff1cc 100644 (file)
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -28,7 +28,7 @@
 
 extern const char *CardType[];
 
-const char *Diva_revision = "$Revision: 1.33.2.6 $";
+static const char *Diva_revision = "$Revision: 1.33.2.6 $";
 
 #define byteout(addr,val) outb(val,addr)
 #define bytein(addr) inb(addr)
@@ -476,7 +476,7 @@ Memhscx_fill_fifo(struct BCState *bcs)
        }
 }
 
-static inline void
+static void
 Memhscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
 {
        u_char r;
@@ -706,7 +706,7 @@ diva_irq_ipacx_pci(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
 
-void
+static void
 release_io_diva(struct IsdnCardState *cs)
 {
        int bytecnt;
@@ -1027,7 +1027,7 @@ setup_diva(struct IsdnCard *card)
                        }
                }
 #endif
-#if CONFIG_PCI
+#ifdef CONFIG_PCI
                cs->subtyp = 0;
                if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON,
                        PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) {