From cb3c438ea4c0e638cba08bfaa8e2b64ffb8a6ce3 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 4 May 2011 13:08:58 +1000 Subject: 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 Signed-off-by: Dave Airlie --- drivers/gpu/drm/drm_modes.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers') 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; -- cgit v1.2.1