drm/fb: fix CONFIG_DRM=m && CONFIG_FB=n
authorDave Airlie <airlied@redhat.com>
Wed, 4 May 2011 03:08:58 +0000 (13:08 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 4 May 2011 03:08:58 +0000 (13:08 +1000)
The previous commit to move the parsing into the core drm created a
new situation and a soft dependency on the CONFIG_FB. We really don't
want to make this a hard dependency so just wrap the one place that
actually needs an fb symbol.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_modes.c

index 207b7ebf8150d8bad6fa6166d1a84760fe7f8282..c2d32f20e2fb606838f5799b538f57baa765ce9e 100644 (file)
@@ -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;