---

yaml --- r: 250566 b: refs/heads/master c: cb3c438 h: refs/heads/master v: v3
git-mirror · May 4, 2011 · 229f5d2 · 229f5d2
1 parent 0a8ab14
commit 229f5d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1794d257fa7bab3ea5162f8abdca749996b65343
+refs/heads/master: cb3c438ea4c0e638cba08bfaa8e2b64ffb8a6ce3
diff --git a/trunk/drivers/gpu/drm/drm_modes.c b/trunk/drivers/gpu/drm/drm_modes.c
@@ -1000,8 +1000,10 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
 	int i;
 	enum drm_connector_force force = DRM_FORCE_UNSPECIFIED;
 
+#ifdef CONFIG_FB
 	if (!mode_option)
 		mode_option = fb_mode_option;
+#endif
 
 	if (!mode_option) {
 		mode->specified = false;