diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/video/console/tileblit.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/video/console/tileblit.c')
| -rw-r--r-- | drivers/video/console/tileblit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/tileblit.c b/drivers/video/console/tileblit.c index 0056a41e5c35..15e8e1a89c45 100644 --- a/drivers/video/console/tileblit.c +++ b/drivers/video/console/tileblit.c | |||
| @@ -83,7 +83,7 @@ static void tile_cursor(struct vc_data *vc, struct fb_info *info, int mode, | |||
| 83 | int softback_lines, int fg, int bg) | 83 | int softback_lines, int fg, int bg) |
| 84 | { | 84 | { |
| 85 | struct fb_tilecursor cursor; | 85 | struct fb_tilecursor cursor; |
| 86 | int use_sw = (vc->vc_cursor_type & 0x01); | 86 | int use_sw = (vc->vc_cursor_type & 0x10); |
| 87 | 87 | ||
| 88 | cursor.sx = vc->vc_x; | 88 | cursor.sx = vc->vc_x; |
| 89 | cursor.sy = vc->vc_y; | 89 | cursor.sy = vc->vc_y; |