Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

[firefly-linux-kernel-4.4.55.git] / drivers / video / atafb.c

diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index f3aada20fa02ad5e51264b1f347dd50e6120e85e..5b2b5ef4edba9dba4e125e4dc01ba304dbbb5dfe 100644 (file)
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -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;
 }