diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-05-04 05:08:58 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-04 05:08:58 +0200 |
| commit | cb3c438ea4c0e638cba08bfaa8e2b64ffb8a6ce3 (patch) | |
| tree | bcd327649650a155e9e2427decf5f2a0e3d2c98e | |
| parent | drm: Export the command-line mode parser (diff) | |
| download | linux-cb3c438ea4c0e638cba08bfaa8e2b64ffb8a6ce3.tar.xz linux-cb3c438ea4c0e638cba08bfaa8e2b64ffb8a6ce3.zip | |
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>
| -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, 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; |