diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-07-31 15:18:32 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-07-31 15:18:32 -0400 |
| commit | 5052e966ec7fe5146c2d73b90482003619add5da (patch) | |
| tree | a48e771871fd64a2892f5ce75e6e309b03db5e06 /shared-core/nouveau_mem.c | |
| parent | 6d4e147480a334d32fa59c7fde53e10d7ab6e106 (diff) | |
| parent | 95c02743c96ca9e959f68a6e942206bdfadae53a (diff) | |
Merge commit 'origin/master' into modesetting-gem
Conflicts:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drm_compat.h
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
Diffstat (limited to 'shared-core/nouveau_mem.c')
| -rw-r--r-- | shared-core/nouveau_mem.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c index 375463b4..1078a9c5 100644 --- a/shared-core/nouveau_mem.c +++ b/shared-core/nouveau_mem.c @@ -36,7 +36,6 @@ #include "nouveau_drv.h" #include "nv50_kms_wrapper.h" - static struct mem_block * split_block(struct mem_block *p, uint64_t start, uint64_t size, struct drm_file *file_priv) |