diff --git a/[refs] b/[refs]
index 4355e33b8355..7f4f0993ef2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5a8e7362a0a5088ac080086d41cd98a54e0791b
+refs/heads/master: 193fdd1a99db8623697cb18a13dbcaa4eadbb1f2
diff --git a/trunk/arch/avr32/mm/init.c b/trunk/arch/avr32/mm/init.c
index 82cf70854b90..480760bde63f 100644
--- a/trunk/arch/avr32/mm/init.c
+++ b/trunk/arch/avr32/mm/init.c
@@ -224,19 +224,9 @@ void free_initmem(void)
 
 #ifdef CONFIG_BLK_DEV_INITRD
 
-static int keep_initrd;
-
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-	if (!keep_initrd)
-		free_area(start, end, "initrd");
-}
-
-static int __init keepinitrd_setup(char *__unused)
-{
-	keep_initrd = 1;
-	return 1;
+	free_area(start, end, "initrd");
 }
 
-__setup("keepinitrd", keepinitrd_setup);
 #endif