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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
video
/
console
/
promcon.c
diff --git
a/drivers/video/console/promcon.c
b/drivers/video/console/promcon.c
index
1458b16
..
b78eac6
100644
(file)
--- a/
drivers/video/console/promcon.c
+++ b/
drivers/video/console/promcon.c
@@
-5,13
+5,11
@@
* Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
*/
* Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
*/
-#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/delay.h>
#include <linux/console.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/console.h>
@@
-109,7
+107,7
@@
promcon_end(struct vc_data *conp, char *b)
return b - p;
}
return b - p;
}
-const char
__init
*promcon_startup(void)
+const char *promcon_startup(void)
{
const char *display_desc = "PROM";
int node;
{
const char *display_desc = "PROM";
int node;
@@
-133,7
+131,7
@@
const char __init *promcon_startup(void)
return display_desc;
}
return display_desc;
}
-static void
__init
+static void
promcon_init_unimap(struct vc_data *conp)
{
mm_segment_t old_fs = get_fs();
promcon_init_unimap(struct vc_data *conp)
{
mm_segment_t old_fs = get_fs();
@@
-155,9
+153,9
@@
promcon_init_unimap(struct vc_data *conp)
k++;
}
set_fs(KERNEL_DS);
k++;
}
set_fs(KERNEL_DS);
- con_clear_unimap(conp
->vc_num
, NULL);
- con_set_unimap(conp
->vc_num
, k, p);
- con_protect_unimap(conp
->vc_num
, 1);
+ con_clear_unimap(conp, NULL);
+ con_set_unimap(conp, k, p);
+ con_protect_unimap(conp, 1);
set_fs(old_fs);
kfree(p);
}
set_fs(old_fs);
kfree(p);
}
@@
-175,7
+173,7
@@
promcon_init(struct vc_data *conp, int init)
p = *conp->vc_uni_pagedir_loc;
if (conp->vc_uni_pagedir_loc == &conp->vc_uni_pagedir ||
!--conp->vc_uni_pagedir_loc[1])
p = *conp->vc_uni_pagedir_loc;
if (conp->vc_uni_pagedir_loc == &conp->vc_uni_pagedir ||
!--conp->vc_uni_pagedir_loc[1])
- con_free_unimap(conp
->vc_num
);
+ con_free_unimap(conp);
conp->vc_uni_pagedir_loc = promcon_uni_pagedir;
promcon_uni_pagedir[1]++;
if (!promcon_uni_pagedir[0] && p) {
conp->vc_uni_pagedir_loc = promcon_uni_pagedir;
promcon_uni_pagedir[1]++;
if (!promcon_uni_pagedir[0] && p) {
@@
-183,7
+181,7
@@
promcon_init(struct vc_data *conp, int init)
}
if (!init) {
if (conp->vc_cols != pw + 1 || conp->vc_rows != ph + 1)
}
if (!init) {
if (conp->vc_cols != pw + 1 || conp->vc_rows != ph + 1)
- vc_resize(conp
->vc_num
, pw + 1, ph + 1);
+ vc_resize(conp, pw + 1, ph + 1);
}
}
}
}
@@
-192,9
+190,9
@@
promcon_deinit(struct vc_data *conp)
{
/* When closing the last console, reset video origin */
if (!--promcon_uni_pagedir[1])
{
/* When closing the last console, reset video origin */
if (!--promcon_uni_pagedir[1])
- con_free_unimap(conp
->vc_num
);
+ con_free_unimap(conp);
conp->vc_uni_pagedir_loc = &conp->vc_uni_pagedir;
conp->vc_uni_pagedir_loc = &conp->vc_uni_pagedir;
- con_set_default_unimap(conp
->vc_num
);
+ con_set_default_unimap(conp);
}
static int
}
static int
@@
-456,12
+454,6
@@
promcon_cursor(struct vc_data *conp, int mode)
}
}
}
}
-static int
-promcon_font_op(struct vc_data *conp, struct console_font_op *op)
-{
- return -ENOSYS;
-}
-
static int
promcon_blank(struct vc_data *conp, int blank, int mode_switch)
{
static int
promcon_blank(struct vc_data *conp, int blank, int mode_switch)
{
@@
-586,7
+578,6
@@
const struct consw prom_con = {
.con_bmove = promcon_bmove,
.con_switch = promcon_switch,
.con_blank = promcon_blank,
.con_bmove = promcon_bmove,
.con_switch = promcon_switch,
.con_blank = promcon_blank,
- .con_font_op = promcon_font_op,
.con_set_palette = DUMMY,
.con_scrolldelta = DUMMY,
#if !(PROMCON_COLOR)
.con_set_palette = DUMMY,
.con_scrolldelta = DUMMY,
#if !(PROMCON_COLOR)