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

[linux-2.6] / drivers / isdn / hisax / elsa.c

diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 0c1351b23840f8946e151cb45c0e829921ce4c93..948a9b290fd1146933a9d1cb38a9d6993db989a2 100644 (file)
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -1088,7 +1088,7 @@ setup_elsa_pci(struct IsdnCard *card)
 
 #else
 
-static void __devinit
+static int __devinit
 setup_elsa_pci(struct IsdnCard *card)
 {
        return (1);