From 229f5d22af9cce03fc1ca0092a26fe1d28db09c0 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 4 May 2011 13:08:58 +1000
Subject: [PATCH] --- yaml --- r: 250566 b: refs/heads/master c:
 cb3c438ea4c0e638cba08bfaa8e2b64ffb8a6ce3 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/gpu/drm/drm_modes.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 576b4d5d6097..0202697b7301 100644
--- 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
index 207b7ebf8150..c2d32f20e2fb 100644
--- 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;