diff options
author | Dave Airlie <airlied@redhat.com> | 2011-05-03 23:08:58 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-05-03 23:08:58 -0400 |
commit | cb3c438ea4c0e638cba08bfaa8e2b64ffb8a6ce3 (patch) | |
tree | bcd327649650a155e9e2427decf5f2a0e3d2c98e /drivers/gpu | |
parent | 1794d257fa7bab3ea5162f8abdca749996b65343 (diff) |
drm/fb: fix CONFIG_DRM=m && CONFIG_FB=n
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/drm_modes.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 207b7ebf8150..c2d32f20e2fb 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c | |||
@@ -1000,8 +1000,10 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, | |||
1000 | int i; | 1000 | int i; |
1001 | enum drm_connector_force force = DRM_FORCE_UNSPECIFIED; | 1001 | enum drm_connector_force force = DRM_FORCE_UNSPECIFIED; |
1002 | 1002 | ||
1003 | #ifdef CONFIG_FB | ||
1003 | if (!mode_option) | 1004 | if (!mode_option) |
1004 | mode_option = fb_mode_option; | 1005 | mode_option = fb_mode_option; |
1006 | #endif | ||
1005 | 1007 | ||
1006 | if (!mode_option) { | 1008 | if (!mode_option) { |
1007 | mode->specified = false; | 1009 | mode->specified = false; |