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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
video
/
console
/
mdacon.c
diff --git
a/drivers/video/console/mdacon.c
b/drivers/video/console/mdacon.c
index
6dbeb18
..
be3d535
100644
(file)
--- a/
drivers/video/console/mdacon.c
+++ b/
drivers/video/console/mdacon.c
@@
-47,7
+47,7
@@
#include <asm/io.h>
#include <asm/vga.h>
#include <asm/io.h>
#include <asm/vga.h>
-static
spinlock_t mda_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(mda_lock)
;
/* description of the hardware layout */
/* description of the hardware layout */
@@
-64,7
+64,6
@@
static unsigned int mda_gfx_port; /* Graphics control port */
/* current hardware state */
/* current hardware state */
-static int mda_origin_loc=-1;
static int mda_cursor_loc=-1;
static int mda_cursor_size_from=-1;
static int mda_cursor_size_to=-1;
static int mda_cursor_loc=-1;
static int mda_cursor_size_from=-1;
static int mda_cursor_size_to=-1;
@@
-79,8
+78,8
@@
static int mda_last_vc = 16;
static struct vc_data *mda_display_fg = NULL;
static struct vc_data *mda_display_fg = NULL;
-
MODULE_PARM(mda_first_vc, "1-255i"
);
-
MODULE_PARM(mda_last_vc, "1-255i"
);
+
module_param(mda_first_vc, int, 0
);
+
module_param(mda_last_vc, int, 0
);
/* MDA register values
*/
/* MDA register values
*/
@@
-148,16
+147,6
@@
static int test_mda_b(unsigned char val, unsigned char reg)
}
#endif
}
#endif
-static inline void mda_set_origin(unsigned int location)
-{
- if (mda_origin_loc == location)
- return;
-
- write_mda_w(location >> 1, 0x0c);
-
- mda_origin_loc = location;
-}
-
static inline void mda_set_cursor(unsigned int location)
{
if (mda_cursor_loc == location)
static inline void mda_set_cursor(unsigned int location)
{
if (mda_cursor_loc == location)