Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 73670
b: refs/heads/master
c: 03ad369
h: refs/heads/master
v: v3
  • Loading branch information
Frank Lichtenheld authored and Linus Torvalds committed Nov 15, 2007
1 parent 6c97dc9 commit 6013278
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f8c0234f275c8198cbb68f16e035fa46254e372
refs/heads/master: 03ad369ac900116f35da7505f768ebbd481d09a4
6 changes: 4 additions & 2 deletions trunk/drivers/video/uvesafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -926,8 +926,10 @@ static int uvesafb_setpalette(struct uvesafb_pal_entry *entries, int count,
int start, struct fb_info *info)
{
struct uvesafb_ktask *task;
#ifdef CONFIG_X86
struct uvesafb_par *par = info->par;
int i = par->mode_idx;
#endif
int err = 0;

/*
Expand Down Expand Up @@ -1103,11 +1105,11 @@ static int uvesafb_pan_display(struct fb_var_screeninfo *var,

static int uvesafb_blank(int blank, struct fb_info *info)
{
struct uvesafb_par *par = info->par;
struct uvesafb_ktask *task;
int err = 1;

#ifdef CONFIG_X86
struct uvesafb_par *par = info->par;

if (par->vbe_ib.capabilities & VBE_CAP_VGACOMPAT) {
int loop = 10000;
u8 seq = 0, crtc17 = 0;
Expand Down

0 comments on commit 6013278

Please sign in to comment.