---

yaml --- r: 213298 b: refs/heads/master c: 8ce71db h: refs/heads/master v: v3
git-mirror · Oct 22, 2010 · d5cb4d8 · d5cb4d8
1 parent b5c1d22
commit d5cb4d8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10b68799b32d60ff578742d0deebc98afff30dba
+refs/heads/master: 8ce71db25edccde4d8e3e39bffb4178bf1018ef1
diff --git a/trunk/drivers/video/atafb.c b/trunk/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;
 }