Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267567
b: refs/heads/master
c: 44c4ec7
h: refs/heads/master
i:
  267565: cc0bc78
  267563: 25c108b
  267559: fd4dcff
  267551: 110141f
v: v3
  • Loading branch information
Ruslan Pisarev authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 0b014fb commit d5d78d2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 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: 7a27b042f9cf6bd6e60c236a55d7a71a64287a84
refs/heads/master: 44c4ec78c901f7ce85c64f074ca12828c1301d3f
20 changes: 10 additions & 10 deletions trunk/drivers/staging/xgifb/XGI_main.h
Original file line number Diff line number Diff line change
Expand Up @@ -268,28 +268,28 @@ static u32 pseudo_palette[17];


/* display status */
static int XGIfb_off = 0;
static int XGIfb_crt1off = 0;
static int XGIfb_off;
static int XGIfb_crt1off;
static int XGIfb_forcecrt1 = -1;
static int XGIfb_userom = 0;
static int XGIfb_userom ;
/*static int XGIfb_useoem = -1; */

/* global flags */
static int XGIfb_registered;
static int XGIfb_tvmode = 0;
static int XGIfb_pdc = 0;
static int enable_dstn = 0;
static int XGIfb_tvmode;
static int XGIfb_pdc;
static int enable_dstn;
static int XGIfb_ypan = -1;


static int XGIfb_CRT2_write_enable = 0;
static int XGIfb_CRT2_write_enable;

/* TW: CRT2 type (for overriding autodetection) */
static int XGIfb_crt2type = -1;
/* PR: Tv plug type (for overriding autodetection) */
static int XGIfb_tvplug = -1;

static unsigned char XGIfb_detectedpdc = 0;
static unsigned char XGIfb_detectedpdc;

static unsigned char XGIfb_detectedlcda = 0xff;

Expand Down Expand Up @@ -483,8 +483,8 @@ static int xgifb_mode_idx = 1;
static int xgifb_mode_idx = -1; /* Use a default mode if we are
inside the kernel */
#endif
static u8 XGIfb_mode_no = 0;
static u8 XGIfb_rate_idx = 0;
static u8 XGIfb_mode_no;
static u8 XGIfb_rate_idx;

/* TW: CR36 evaluation */
static const unsigned short XGI300paneltype[] = {
Expand Down

0 comments on commit d5d78d2

Please sign in to comment.