diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 17:35:56 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-18 17:35:56 +0900 |
| commit | 0421860a5a75b59a76b7a864a172eb090e3d0785 (patch) | |
| tree | df22f28abfa4c8bb77d650b674a44e0aedc586be /drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | |
| parent | cf655c36fad7b6488a56f18ab56f7d608ca6552b (diff) | |
| parent | 89ba4d12fca24d373e1b10fce498d68157bafaf0 (diff) | |
| download | blackbird-op-linux-0421860a5a75b59a76b7a864a172eb090e3d0785.tar.gz blackbird-op-linux-0421860a5a75b59a76b7a864a172eb090e3d0785.zip | |
Merge branch 'rmobile/ag5' into rmobile-latest
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c index df2036ed18d5..f1a52f9e7298 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c @@ -585,7 +585,7 @@ int vmw_overlay_init(struct vmw_private *dev_priv) return -ENOSYS; } - overlay = kmalloc(GFP_KERNEL, sizeof(*overlay)); + overlay = kmalloc(sizeof(*overlay), GFP_KERNEL); if (!overlay) return -ENOMEM; |
