summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorChristian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>2010-09-06 18:36:47 +0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-10-22 11:43:25 +0400
commit8ce71db25edccde4d8e3e39bffb4178bf1018ef1 (patch)
treea247292bef182306c27ce6e24f758470ba6fc696 /drivers/video
parent10b68799b32d60ff578742d0deebc98afff30dba (diff)
downloadlinux-8ce71db25edccde4d8e3e39bffb4178bf1018ef1.tar.xz
fbdev: atafb - Remove undead ifdef ATAFB_FALCON
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/atafb.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index f3aada20fa02..5b2b5ef4edba 100644
--- 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;
}