projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
[powerpc.git]
/
drivers
/
video
/
console
/
fbcon.h
diff --git
a/drivers/video/console/fbcon.h
b/drivers/video/console/fbcon.h
index
3487a63
..
71f24e0
100644
(file)
--- a/
drivers/video/console/fbcon.h
+++ b/
drivers/video/console/fbcon.h
@@
-11,7
+11,6
@@
#ifndef _VIDEO_FBCON_H
#define _VIDEO_FBCON_H
#ifndef _VIDEO_FBCON_H
#define _VIDEO_FBCON_H
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/vt_buffer.h>
#include <linux/vt_kern.h>
#include <linux/types.h>
#include <linux/vt_buffer.h>
#include <linux/vt_kern.h>
@@
-49,7
+48,7
@@
struct display {
struct fb_bitfield green;
struct fb_bitfield blue;
struct fb_bitfield transp;
struct fb_bitfield green;
struct fb_bitfield blue;
struct fb_bitfield transp;
- struct fb_videomode *mode;
+
const
struct fb_videomode *mode;
};
struct fbcon_ops {
};
struct fbcon_ops {
@@
-81,6
+80,8
@@
struct fbcon_ops {
char *cursor_data;
u8 *fontbuffer;
u8 *fontdata;
char *cursor_data;
u8 *fontbuffer;
u8 *fontdata;
+ u8 *cursor_src;
+ u32 cursor_size;
u32 fd_size;
};
/*
u32 fd_size;
};
/*