diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/gpu/drm/drm_mm.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/gpu/drm/drm_mm.c')
| -rw-r--r-- | drivers/gpu/drm/drm_mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index add1737dae0..5d00b0fc0d9 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c | |||
| @@ -551,7 +551,7 @@ EXPORT_SYMBOL(drm_mm_scan_add_block); | |||
| 551 | * corrupted. | 551 | * corrupted. |
| 552 | * | 552 | * |
| 553 | * When the scan list is empty, the selected memory nodes can be freed. An | 553 | * When the scan list is empty, the selected memory nodes can be freed. An |
| 554 | * immediatly following drm_mm_search_free with best_match = 0 will then return | 554 | * immediately following drm_mm_search_free with best_match = 0 will then return |
| 555 | * the just freed block (because its at the top of the free_stack list). | 555 | * the just freed block (because its at the top of the free_stack list). |
| 556 | * | 556 | * |
| 557 | * Returns one if this block should be evicted, zero otherwise. Will always | 557 | * Returns one if this block should be evicted, zero otherwise. Will always |