Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / drivers / video / fbdev / 68328fb.c

diff --git a/drivers/video/fbdev/68328fb.c b/drivers/video/fbdev/68328fb.c
index 552258c..17f21ce 100644 (file)
--- a/drivers/video/fbdev/68328fb.c
+++ b/drivers/video/fbdev/68328fb.c
@@ -49,12 +49,6 @@
 #error wrong architecture for the MC68x328 frame buffer device
 #endif
 
-#if defined(CONFIG_FB_68328_INVERT)
-#define MC68X328FB_MONO_VISUAL FB_VISUAL_MONO01
-#else
-#define MC68X328FB_MONO_VISUAL FB_VISUAL_MONO10
-#endif
-
 static u_long videomemory;
 static u_long videomemorysize;
 
@@ -462,7 +456,7 @@ int __init mc68x328fb_init(void)
        fb_info.fix.line_length =
                get_line_length(mc68x328fb_default.xres_virtual, mc68x328fb_default.bits_per_pixel);
        fb_info.fix.visual = (mc68x328fb_default.bits_per_pixel) == 1 ?
-               MC68X328FB_MONO_VISUAL : FB_VISUAL_PSEUDOCOLOR;
+               FB_VISUAL_MONO10 : FB_VISUAL_PSEUDOCOLOR;
        if (fb_info.var.bits_per_pixel == 1) {
                fb_info.var.red.length = fb_info.var.green.length = fb_info.var.blue.length = 1;
                fb_info.var.red.offset = fb_info.var.green.offset = fb_info.var.blue.offset = 0;