diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-03-08 04:25:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-03-08 04:25:54 -0500 |
| commit | def7102a5bd2d60b1a96a58a39846150285d7c77 (patch) | |
| tree | df0e6726c593a7e1f820a3341c627835a1c0d5ce /include/linux/consolemap.h | |
| parent | a4bc8f1c791fa542a6f0f8043b670690894bd440 (diff) | |
| parent | 09aa3367ff6a0bbff7ce35eb770aab23bc9d4213 (diff) | |
Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/net-drivers-2.6
Diffstat (limited to 'include/linux/consolemap.h')
| -rw-r--r-- | include/linux/consolemap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/consolemap.h b/include/linux/consolemap.h index dee4b654c589..65842efc1b70 100644 --- a/include/linux/consolemap.h +++ b/include/linux/consolemap.h @@ -11,5 +11,5 @@ struct vc_data; extern unsigned char inverse_translate(struct vc_data *conp, int glyph); -extern unsigned short *set_translate(int m,int currcons); +extern unsigned short *set_translate(int m, struct vc_data *vc); extern int conv_uni_to_pc(struct vc_data *conp, long ucs); |