diff --git a/[refs] b/[refs]
index 5a2b42ea041f..d6e89de32a47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cf69e765a99baacf0121f3312ec84ff1031961d
+refs/heads/master: 3bdcdd681b64fa92934039ff0d217414720a4b1e
diff --git a/trunk/arch/mips/jazz/setup.c b/trunk/arch/mips/jazz/setup.c
index 3a7869fbaf32..50cecfca7f87 100644
--- a/trunk/arch/mips/jazz/setup.c
+++ b/trunk/arch/mips/jazz/setup.c
@@ -98,8 +98,6 @@ void __init plat_mem_setup(void)
 	_machine_halt = jazz_machine_halt;
 	pm_power_off = jazz_machine_power_off;
 
-#warning "Somebody should check if screen_info is ok for Jazz."
-
 	screen_info = (struct screen_info) {
 		0, 0,		/* orig-x, orig-y */
 		0,		/* unused */