diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-07-25 15:58:48 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-07-25 15:58:48 -0400 |
| commit | 8407884dd9164ec18ed2afc00f56b87e36c51fcf (patch) | |
| tree | b6ea42c231d7d39f454de28a068d78ce11709770 /drivers/video/i740fb.c | |
| parent | dc7f71f486f4f5fa96f6dcf86833da020cde8a11 (diff) | |
| parent | bdc0077af574800d24318b6945cf2344e8dbb050 (diff) | |
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
Two bits were appended to the end of the bitfield
list in struct scsi_device. Resolve that conflict
by including both bits.
Conflicts:
include/scsi/scsi_device.h
Diffstat (limited to 'drivers/video/i740fb.c')
| -rw-r--r-- | drivers/video/i740fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c index fe574d84ed9..ff3f8808e4e 100644 --- a/drivers/video/i740fb.c +++ b/drivers/video/i740fb.c @@ -497,7 +497,7 @@ static int i740fb_decode_var(const struct fb_var_screeninfo *var, mem = vxres * vyres * ((bpp + 1) / 8); if (mem > info->screen_size) { - dev_err(info->device, "not enough video memory (%d KB requested, %ld KB avaliable)\n", + dev_err(info->device, "not enough video memory (%d KB requested, %ld KB available)\n", mem >> 10, info->screen_size >> 10); return -ENOMEM; } @@ -728,7 +728,7 @@ static void vga_protect(struct i740fb_par *par) i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0x20, 0x20); i740inb(par, 0x3DA); - i740outb(par, VGA_ATT_W, 0x00); /* enable pallete access */ + i740outb(par, VGA_ATT_W, 0x00); /* enable palette access */ } static void vga_unprotect(struct i740fb_par *par) @@ -737,7 +737,7 @@ static void vga_unprotect(struct i740fb_par *par) i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0, 0x20); i740inb(par, 0x3DA); - i740outb(par, VGA_ATT_W, 0x20); /* disable pallete access */ + i740outb(par, VGA_ATT_W, 0x20); /* disable palette access */ } static int i740fb_set_par(struct fb_info *info) |