diff --git a/[refs] b/[refs]
index ba44359a458d..2f58c36ae7bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a76f9fe122e0ba6ff95d3a4daa854e761f8a6a76
+refs/heads/master: 778220f7c4a3357f7464a45044fd4937126ba6c5
diff --git a/trunk/drivers/tc/tc.c b/trunk/drivers/tc/tc.c
index 2613c5135c09..d742c3a90b23 100644
--- a/trunk/drivers/tc/tc.c
+++ b/trunk/drivers/tc/tc.c
@@ -8,7 +8,7 @@
  * for more details.
  *
  * Copyright (c) Harald Koerfgen, 1998
- * Copyright (c) 2001, 2003  Maciej W. Rozycki
+ * Copyright (c) 2001, 2003, 2005  Maciej W. Rozycki
  */
 #include <linux/string.h>
 #include <linux/init.h>
@@ -177,7 +177,7 @@ static void __init tc_probe(unsigned long startaddr, unsigned long size,
 /*
  * the main entry
  */
-void __init tc_init(void)
+static int __init tc_init(void)
 {
 	int tc_clock;
 	int i;
@@ -185,7 +185,7 @@ void __init tc_init(void)
 	unsigned long slot_size;
 
 	if (!TURBOCHANNEL)
-		return;
+		return 0;
 
 	for (i = 0; i < MAX_SLOT; i++) {
 		tc_bus[i].base_addr = 0;
@@ -246,6 +246,8 @@ void __init tc_init(void)
 			}
 #endif
 	}
+
+	return 0;
 }
 
 subsys_initcall(tc_init);