diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /include/drm/ttm/ttm_memory.h | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
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 @@ | |||
| 41 | * @do_shrink: The callback function. | 41 | * @do_shrink: The callback function. |
| 42 | * | 42 | * |
| 43 | * Arguments to the do_shrink functions are intended to be passed using | 43 | * Arguments to the do_shrink functions are intended to be passed using |
| 44 | * inheritance. That is, the argument class derives from struct ttm_mem_srink, | 44 | * inheritance. That is, the argument class derives from struct ttm_mem_shrink, |
| 45 | * and can be accessed using container_of(). | 45 | * and can be accessed using container_of(). |
| 46 | */ | 46 | */ |
| 47 | 47 | ||