diff options
Diffstat (limited to 'drivers/video/cfbcopyarea.c')
-rw-r--r-- | drivers/video/cfbcopyarea.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c index 6faea4034e3d..032210f45be3 100644 --- a/drivers/video/cfbcopyarea.c +++ b/drivers/video/cfbcopyarea.c | |||
@@ -22,8 +22,6 @@ | |||
22 | * help moving some redundant computations and branches out of the loop, too. | 22 | * help moving some redundant computations and branches out of the loop, too. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | |||
26 | |||
27 | #include <linux/module.h> | 25 | #include <linux/module.h> |
28 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
29 | #include <linux/string.h> | 27 | #include <linux/string.h> |
@@ -31,6 +29,7 @@ | |||
31 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
32 | #include <asm/types.h> | 30 | #include <asm/types.h> |
33 | #include <asm/io.h> | 31 | #include <asm/io.h> |
32 | #include "fb_draw.h" | ||
34 | 33 | ||
35 | #if BITS_PER_LONG == 32 | 34 | #if BITS_PER_LONG == 32 |
36 | # define FB_WRITEL fb_writel | 35 | # define FB_WRITEL fb_writel |
@@ -41,17 +40,6 @@ | |||
41 | #endif | 40 | #endif |
42 | 41 | ||
43 | /* | 42 | /* |
44 | * Compose two values, using a bitmask as decision value | ||
45 | * This is equivalent to (a & mask) | (b & ~mask) | ||
46 | */ | ||
47 | |||
48 | static inline unsigned long | ||
49 | comp(unsigned long a, unsigned long b, unsigned long mask) | ||
50 | { | ||
51 | return ((a ^ b) & mask) ^ b; | ||
52 | } | ||
53 | |||
54 | /* | ||
55 | * Generic bitwise copy algorithm | 43 | * Generic bitwise copy algorithm |
56 | */ | 44 | */ |
57 | 45 | ||