Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbdev: mach64_cursor: Remove fb_draw.h includes

Remove dependency on fb_draw.h to allow fbcon packed pixel drawing refactoring.

Signed-off-by: Zsolt Kajtar <soci@c64.rulez.org>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Zsolt Kajtar and committed by
Helge Deller
b8389cbe 5fc830d6

+6 -1
+6 -1
drivers/video/fbdev/aty/mach64_cursor.c
··· 6 6 #include <linux/fb.h> 7 7 #include <linux/init.h> 8 8 #include <linux/string.h> 9 - #include "../core/fb_draw.h" 10 9 11 10 #include <asm/io.h> 12 11 ··· 55 56 * CUR_OFFSET must be adjusted to a point to the appropriate line in the cursor 56 57 * definitation and CUR_VERT_POSN must be saturated to zero. 57 58 */ 59 + 60 + /* compose pixels based on mask */ 61 + static inline unsigned long comp(unsigned long set, unsigned long unset, unsigned long mask) 62 + { 63 + return ((set ^ unset) & mask) ^ unset; 64 + } 58 65 59 66 /* 60 67 * Hardware Cursor support.