Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267568
b: refs/heads/master
c: e684f46
h: refs/heads/master
v: v3
  • Loading branch information
Ruslan Pisarev authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent d5d78d2 commit cfcffde
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 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: 44c4ec78c901f7ce85c64f074ca12828c1301d3f
refs/heads/master: e684f4682d49e4815d2b6893a1862f183d755fb2
26 changes: 13 additions & 13 deletions trunk/drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,8 @@ static unsigned char XGIfb_query_VGA_config_space(
struct xgi_hw_device_info *pXGIhw_ext, unsigned long offset,
unsigned long set, unsigned long *value)
{
static struct pci_dev *pdev = NULL;
static unsigned char init = 0, valid_pdev = 0;
static struct pci_dev *pdev;
static unsigned char init, valid_pdev;

if (!set)
DPRINTK("XGIfb: Get VGA offset 0x%lx\n", offset);
Expand Down Expand Up @@ -2564,26 +2564,26 @@ module_init(xgifb_init);

#ifdef MODULE

static char *mode = NULL;
static int vesa = 0;
static unsigned int rate = 0;
static unsigned int mem = 0;
static char *forcecrt2type = NULL;
static char *mode;
static int vesa;
static unsigned int rate;
static unsigned int mem;
static char *forcecrt2type;
static int forcecrt1 = -1;
static int pdc = -1;
static int pdc1 = -1;
static int noypan = -1;
static int userom = -1;
static int useoem = -1;
static char *tvstandard = NULL;
static int nocrt2rate = 0;
static char *tvstandard;
static int nocrt2rate;
static int scalelcd = -1;
static char *specialtiming = NULL;
static char *specialtiming;
static int lvdshl = -1;
static int tvxposoffset = 0, tvyposoffset = 0;
static int tvxposoffset, tvyposoffset;
#if !defined(__i386__) && !defined(__x86_64__)
static int resetcard = 0;
static int videoram = 0;
static int resetcard;
static int videoram;
#endif

MODULE_DESCRIPTION("Z7 Z9 Z9S Z11 framebuffer device driver");
Expand Down

0 comments on commit cfcffde

Please sign in to comment.