Skip to content

Commit

Permalink
drm/fb: fix CONFIG_DRM=m && CONFIG_FB=n
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dave Airlie committed May 4, 2011
1 parent 1794d25 commit cb3c438
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/drm_modes.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit cb3c438

Please sign in to comment.