diff options
author | James Simmons <jsimmons@infradead.org> | 2005-09-09 16:04:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 16:57:59 -0400 |
commit | 4c7ffe0b9f7f40bd818fe3af51342f64c483908e (patch) | |
tree | 2827dd7904f46cbaff935e221563cd017707f10f /drivers/video/intelfb/intelfbhw.c | |
parent | d2d58384fc5d4c0fe2d8e34bc2d15a90a9bb372a (diff) |
[PATCH] fbdev: prevent drivers that have hardware cursors from calling software cursor code
This patch removes drivers that have hardware cursors from calling the
software cursor code. Also if the driver sets a no hardware cursor flag
then the driver reports a error it someone attempts to use the cursor.
Signed-off-by: James Simmons <jsimmons@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/intelfb/intelfbhw.c')
-rw-r--r-- | drivers/video/intelfb/intelfbhw.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index f5bed581dc45..5bafc3c54db7 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
@@ -29,14 +29,10 @@ | |||
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
31 | #include <linux/fb.h> | 31 | #include <linux/fb.h> |
32 | #include <linux/console.h> | ||
33 | #include <linux/selection.h> | ||
34 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
35 | #include <linux/init.h> | 33 | #include <linux/init.h> |
36 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
37 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
38 | #include <linux/kd.h> | ||
39 | #include <linux/vt_kern.h> | ||
40 | #include <linux/pagemap.h> | 36 | #include <linux/pagemap.h> |
41 | #include <linux/version.h> | 37 | #include <linux/version.h> |
42 | 38 | ||