diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2012-08-01 13:49:13 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 13:49:13 +0900 |
| commit | 91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e (patch) | |
| tree | c96ed92413044a28d17783e84a8824bfd2437af1 /drivers/gpu/drm/nouveau/nv50_sor.c | |
| parent | sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757 (diff) | |
| parent | serial: sh-sci: fix compilation breakage, when DMA is enabled (diff) | |
| download | linux-dev-91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e.tar.xz linux-dev-91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e.zip | |
Merge branch 'sh/dmaengine' into sh-latest
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_sor.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_sor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index a9514eaa74c1..93240bde891b 100644 --- a/drivers/gpu/drm/nouveau/nv50_sor.c +++ b/drivers/gpu/drm/nouveau/nv50_sor.c @@ -327,7 +327,8 @@ nv50_sor_restore(struct drm_encoder *encoder) } static bool -nv50_sor_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode, +nv50_sor_mode_fixup(struct drm_encoder *encoder, + const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); |