diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /drivers/video/uvesafb.c | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'drivers/video/uvesafb.c')
| -rw-r--r-- | drivers/video/uvesafb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index be27b9c1ed72..93361656316c 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c | |||
| @@ -44,7 +44,7 @@ static struct fb_fix_screeninfo uvesafb_fix __devinitdata = { | |||
| 44 | 44 | ||
| 45 | static int mtrr __devinitdata = 3; /* enable mtrr by default */ | 45 | static int mtrr __devinitdata = 3; /* enable mtrr by default */ |
| 46 | static int blank = 1; /* enable blanking by default */ | 46 | static int blank = 1; /* enable blanking by default */ |
| 47 | static int ypan __devinitdata = 1; /* 0: scroll, 1: ypan, 2: ywrap */ | 47 | static int ypan = 1; /* 0: scroll, 1: ypan, 2: ywrap */ |
| 48 | static int pmi_setpal __devinitdata = 1; /* use PMI for palette changes */ | 48 | static int pmi_setpal __devinitdata = 1; /* use PMI for palette changes */ |
| 49 | static int nocrtc __devinitdata; /* ignore CRTC settings */ | 49 | static int nocrtc __devinitdata; /* ignore CRTC settings */ |
| 50 | static int noedid __devinitdata; /* don't try DDC transfers */ | 50 | static int noedid __devinitdata; /* don't try DDC transfers */ |