diff --git a/[refs] b/[refs]
index 9233058a22f4..1f22e5fb29ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b8945e8d40645eecdb7d2357ca531f9b4dd9f71
+refs/heads/master: cd3a1b8562d28490b334a61d5eb05df3d722d91e
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 8b42f87e311d..7d5556152234 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -1157,8 +1157,11 @@ void register_console(struct console *console)
 			console->index = 0;
 		if (console->setup == NULL ||
 		    console->setup(console, NULL) == 0) {
-			console->flags |= CON_ENABLED | CON_CONSDEV;
-			preferred_console = 0;
+			console->flags |= CON_ENABLED;
+			if (console->device) {
+				console->flags |= CON_CONSDEV;
+				preferred_console = 0;
+			}
 		}
 	}