diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-31 14:55:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-31 14:55:14 +1000 |
| commit | 3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch) | |
| tree | 15671ed8bd3597d2efe13aa57b755c66014acb57 /drivers/gpu/drm/nouveau/nouveau_bios.c | |
| parent | c414a117c6094c3f86b533f97beaf45ef9075f03 (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
| download | talos-op-linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.tar.gz talos-op-linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.zip | |
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index aed6068a6ca5..b5a9336a2e88 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -3545,7 +3545,7 @@ int nouveau_bios_parse_lvds_table(struct drm_device *dev, int pxclk, bool *dl, b * at which modes should be set up in the dual link style. * * Following the header, the BMP (ver 0xa) table has several records, - * indexed by a seperate xlat table, indexed in turn by the fp strap in + * indexed by a separate xlat table, indexed in turn by the fp strap in * EXTDEV_BOOT. Each record had a config byte, followed by 6 script * numbers for use by INIT_SUB which controlled panel init and power, * and finally a dword of ms to sleep between power off and on |
