diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 19:25:46 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 19:25:46 +0400 |
commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /include/drm/ttm/ttm_memory.h | |
parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
download | linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'include/drm/ttm/ttm_memory.h')
-rw-r--r-- | include/drm/ttm/ttm_memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h index b199170b3c2c..26c1f78d136f 100644 --- a/include/drm/ttm/ttm_memory.h +++ b/include/drm/ttm/ttm_memory.h @@ -41,7 +41,7 @@ * @do_shrink: The callback function. * * Arguments to the do_shrink functions are intended to be passed using - * inheritance. That is, the argument class derives from struct ttm_mem_srink, + * inheritance. That is, the argument class derives from struct ttm_mem_shrink, * and can be accessed using container_of(). */ |