Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus

[pandora-kernel.git] / drivers / gpu / drm / radeon / radeon_drv.h

diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 5cba46b..a1b59ca 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -271,7 +271,7 @@ typedef struct drm_radeon_private {
 
        int have_z_offset;
 
-       /* starting from here on, data is preserved accross an open */
+       /* starting from here on, data is preserved across an open */
        uint32_t flags;         /* see radeon_chip_flags */
        resource_size_t fb_aper_offset;