Staging: merge 2.6.39-rc3 into staging-next

[pandora-kernel.git] / drivers / staging / gma500 / psb_drv.c

diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
index 05c31b9..711e5a9 100644 (file)
--- a/drivers/staging/gma500/psb_drv.c
+++ b/drivers/staging/gma500/psb_drv.c
@@ -556,7 +556,7 @@ static int psb_driver_unload(struct drm_device *dev)
                kfree(dev_priv);
                dev->dev_private = NULL;
 
-               /*destory VBT data*/
+               /*destroy VBT data*/
                psb_intel_destroy_bios(dev);
        }