From 7a806d20b7709a2894a7e29896621964f0021c92 Mon Sep 17 00:00:00 2001 From: Nelson Castillo Date: Tue, 21 Apr 2009 11:18:43 -0500 Subject: glamo_fb: make Xglamo workaround conditional Distributions that use Xorg will not need the workaround at all and now they can disable it. Updated configurations to enable it by default. Signed-off-by: Nelson Castillo --- drivers/mfd/glamo/glamo-fb.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'drivers/mfd/glamo/glamo-fb.c') diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 914eab43e55..1ebb87d1276 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -332,6 +332,8 @@ static int will_orientation_change(struct fb_var_screeninfo *var) return 0; } +#ifdef CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND + /* * See https://docs.openmoko.org/trac/ticket/2255 * We have a hack for some Xglamo bugs in kernel code. @@ -422,6 +424,14 @@ static void glamofb_update_lcd_controller_hack(struct glamofb_handle *glamo, *xres = width; *yres = height; } +#else +#define xglamo_hack_enabled 0 +static void glamofb_update_lcd_controller_hack(struct glamofb_handle *glamo, + struct fb_var_screeninfo *var, + int *xres, int *yres, int *pitch) +{ +} +#endif static void glamofb_update_lcd_controller(struct glamofb_handle *glamo, struct fb_var_screeninfo *var) @@ -1058,12 +1068,14 @@ static int __init glamofb_probe(struct platform_device *pdev) glamofb_cursor_onoff(glamofb, 1); #endif +#ifdef CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND /* sysfs */ rc = sysfs_create_group(&pdev->dev.kobj, &glamo_fb_attr_group); if (rc < 0) { dev_err(&pdev->dev, "cannot create sysfs group\n"); goto out_unmap_fb; } +#endif rc = register_framebuffer(fbinfo); if (rc < 0) { -- cgit v1.2.3