diff --git a/[refs] b/[refs]
index d95b66d857c4..5c876123d165 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d8fe64237646fdd2c2de2722ec4189a5999119d
+refs/heads/master: cc119427bd8663d772c92c1ce43d8ed1831b4d54
diff --git a/trunk/drivers/isdn/hisax/elsa.c b/trunk/drivers/isdn/hisax/elsa.c
index 0c1351b23840..948a9b290fd1 100644
--- a/trunk/drivers/isdn/hisax/elsa.c
+++ b/trunk/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);