diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-13 02:11:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-13 02:11:29 -0400 |
| commit | ad56b0797e67df5e04b2f1a1e02900145c5c16f2 (patch) | |
| tree | 1569bed80a4de531afb88cac9d60ef8bd0aa89f2 /drivers/gpu/drm/drm_memory.c | |
| parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge commit 'v2.6.34-rc7' into tracing/core
Merge reason: Update from -rc5 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpu/drm/drm_memory.c')
| -rw-r--r-- | drivers/gpu/drm/drm_memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c index e4865f99989c..7732268eced2 100644 --- a/drivers/gpu/drm/drm_memory.c +++ b/drivers/gpu/drm/drm_memory.c | |||
| @@ -77,7 +77,7 @@ static void *agp_remap(unsigned long offset, unsigned long size, | |||
| 77 | && (agpmem->bound + (agpmem->pages << PAGE_SHIFT)) >= | 77 | && (agpmem->bound + (agpmem->pages << PAGE_SHIFT)) >= |
| 78 | (offset + size)) | 78 | (offset + size)) |
| 79 | break; | 79 | break; |
| 80 | if (!agpmem) | 80 | if (&agpmem->head == &dev->agp->memory) |
| 81 | return NULL; | 81 | return NULL; |
| 82 | 82 | ||
| 83 | /* | 83 | /* |