Merge branch 'for-next' into for-linus

[linux-2.6-block.git] / drivers / gpu / drm / nouveau / nouveau_drv.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 5f8d987af3631a7fb06e612ae800bcff57de8bae..4b9aaf2a8d0f0052bbafd498998e2c71b1e38434 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -553,7 +553,7 @@ struct drm_nouveau_private {
        uint32_t ramro_offset;
        uint32_t ramro_size;
 
-       /* base physical adresses */
+       /* base physical addresses */
        uint64_t fb_phys;
        uint64_t fb_available_size;
        uint64_t fb_mappable_pages;