diff --git a/[refs] b/[refs]
index 4ab2baa9d7fc..11679d20dc26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a5c5de1b64ec510a6ab6994702c295db00b9acc
+refs/heads/master: 9ba126cfbf505f4d5b39ed294cedd241321c7a91
diff --git a/trunk/arch/mips/kernel/setup.c b/trunk/arch/mips/kernel/setup.c
index fdbb508661c5..8f6e89697ccf 100644
--- a/trunk/arch/mips/kernel/setup.c
+++ b/trunk/arch/mips/kernel/setup.c
@@ -223,7 +223,11 @@ static void __init finalize_initrd(void)
 
 #else  /* !CONFIG_BLK_DEV_INITRD */
 
-#define init_initrd()		0
+static unsigned long __init init_initrd(void)
+{
+	return 0;
+}
+
 #define finalize_initrd()	do {} while (0)
 
 #endif