git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backlight: new driver for ADP5520/ADP5501 MFD PMICs
[safe/jmp/linux-2.6]
/
drivers
/
video
/
console
/
mdacon.c
diff --git
a/drivers/video/console/mdacon.c
b/drivers/video/console/mdacon.c
index
eb4d03f
..
dd3eaaa
100644
(file)
--- a/
drivers/video/console/mdacon.c
+++ b/
drivers/video/console/mdacon.c
@@
-27,7
+27,6
@@
*/
#include <linux/types.h>
*/
#include <linux/types.h>
-#include <linux/sched.h>
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@
-72,13
+71,15
@@
static char *mda_type_name;
/* console information */
/* console information */
-static int mda_first_vc = 1;
+static int mda_first_vc = 1
3
;
static int mda_last_vc = 16;
static struct vc_data *mda_display_fg = NULL;
module_param(mda_first_vc, int, 0);
static int mda_last_vc = 16;
static struct vc_data *mda_display_fg = NULL;
module_param(mda_first_vc, int, 0);
+MODULE_PARM_DESC(mda_first_vc, "First virtual console. Default: 13");
module_param(mda_last_vc, int, 0);
module_param(mda_last_vc, int, 0);
+MODULE_PARM_DESC(mda_last_vc, "Last virtual console. Default: 16");
/* MDA register values
*/
/* MDA register values
*/
@@
-385,7
+386,7
@@
static inline u16 mda_convert_attr(u16 ch)
}
static u8 mdacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
}
static u8 mdacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
- u8 blink, u8 underline, u8 reverse)
+ u8 blink, u8 underline, u8 reverse
, u8 italic
)
{
/* The attribute is just a bit vector:
*
{
/* The attribute is just a bit vector:
*
@@
-398,6
+399,7
@@
static u8 mdacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
return (intensity & 3) |
((underline & 1) << 2) |
((reverse & 1) << 3) |
return (intensity & 3) |
((underline & 1) << 2) |
((reverse & 1) << 3) |
+ (!!italic << 4) |
((blink & 1) << 7);
}
((blink & 1) << 7);
}