fbdev: atafb - Remove undead ifdef ATAFB_FALCON
authorChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Mon, 6 Sep 2010 14:36:47 +0000 (16:36 +0200)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Fri, 22 Oct 2010 07:43:25 +0000 (09:43 +0200)
The ATAFB_FALCON ifdef isn't necessary at this point, because it is
checked in an outer ifdef level already and has no effect here.

Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
drivers/video/atafb.c

index f3aada2..5b2b5ef 100644 (file)
@@ -1718,11 +1718,9 @@ static int falcon_setcolreg(unsigned int regno, unsigned int red,
                        (((red & 0xe000) >> 13) | ((red & 0x1000) >> 12) << 8) |
                        (((green & 0xe000) >> 13) | ((green & 0x1000) >> 12) << 4) |
                        ((blue & 0xe000) >> 13) | ((blue & 0x1000) >> 12);
-#ifdef ATAFB_FALCON
                ((u32 *)info->pseudo_palette)[regno] = ((red & 0xf800) |
                                                       ((green & 0xfc00) >> 5) |
                                                       ((blue & 0xf800) >> 11));
-#endif
        }
        return 0;
 }