git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
video
/
sun3fb.c
diff --git
a/drivers/video/sun3fb.c
b/drivers/video/sun3fb.c
index
bfed02b
..
f80356d
100644
(file)
--- a/
drivers/video/sun3fb.c
+++ b/
drivers/video/sun3fb.c
@@
-25,13
+25,11
@@
* more details.
*/
* more details.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
-#include <linux/tty.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/delay.h>
@@
-505,7
+503,7
@@
void sun3fb_palette(int enter)
if (fb->restore_palette) {
if (enter)
fb->restore_palette(fb);
if (fb->restore_palette) {
if (enter)
fb->restore_palette(fb);
- else if (v
t_cons[i]
->vc_mode != KD_GRAPHICS)
+ else if (v
c_cons[i].d
->vc_mode != KD_GRAPHICS)
vc_cons[i].d->vc_sw->con_set_palette(vc_cons[i].d, color_table);
}
}
vc_cons[i].d->vc_sw->con_set_palette(vc_cons[i].d, color_table);
}
}