diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:38:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:38:59 +1000 |
| commit | fb05c4d621084d7a3fb3dd52d7d9c888eac852d0 (patch) | |
| tree | bca43a3c777984e0eb962d55817541801377d3c4 /linux-core/nv50_display.h | |
| parent | 2556341f8baf0e0b7b5f7843135e43e662751af0 (diff) | |
| parent | 53428453758621da70d9608c9baec58b4b9383ec (diff) | |
Merge remote branch 'origin/modesetting-101' into modesetting-gem
Diffstat (limited to 'linux-core/nv50_display.h')
| -rw-r--r-- | linux-core/nv50_display.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/nv50_display.h b/linux-core/nv50_display.h index f20e67da..3c2ee1c9 100644 --- a/linux-core/nv50_display.h +++ b/linux-core/nv50_display.h @@ -68,7 +68,7 @@ struct nv50_display { }; enum scaling_modes { - SCALE_PANEL, + SCALE_NON_GPU, SCALE_FULLSCREEN, SCALE_ASPECT, SCALE_NOSCALE, |