Merge branch 'v2.6.34-rc2' into drm-linus

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_bios.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index aed6068a6ca5a8c1ba351dab5499121e148c09b9..b5a9336a2e88f58d3e90129c631262896f0f163b 100644 (file)
--- 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