Skip to content

Commit b8389cb

Browse files
soci64hdeller
authored andcommitted
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>
1 parent 5fc830d commit b8389cb

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

drivers/video/fbdev/aty/mach64_cursor.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <linux/fb.h>
77
#include <linux/init.h>
88
#include <linux/string.h>
9-
#include "../core/fb_draw.h"
109

1110
#include <asm/io.h>
1211

@@ -57,6 +56,12 @@
5756
* definitation and CUR_VERT_POSN must be saturated to zero.
5857
*/
5958

59+
/* compose pixels based on mask */
60+
static inline unsigned long comp(unsigned long set, unsigned long unset, unsigned long mask)
61+
{
62+
return ((set ^ unset) & mask) ^ unset;
63+
}
64+
6065
/*
6166
* Hardware Cursor support.
6267
*/

0 commit comments

Comments
 (0)