diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 10:49:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 10:49:11 -0700 |
| commit | ac69e973ff0660e455f4ba1ddd4dcce4ae70ed1a (patch) | |
| tree | 079826480a861b5d02e314248e51d69a9a7b8dfa /drivers/char/drm/drm_memory_debug.h | |
| parent | 102e41fd9dfee357b71e21a38eec3c86ff557bc1 (diff) | |
| parent | d253258c80117c2afaa644554e613201992e4ee9 (diff) | |
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: Fix further issues in drivers/char/drm/via_irq.c
drivers/char/drm/drm_memory.c: possible cleanups
drm: deline a few large inlines in DRM code
drm: remove master setting from add/remove context
drm: drm_pci needs dma-mapping.h
[PATCH] drm: Fix issue reported by Coverity in drivers/char/drm/via_irq.c
Diffstat (limited to 'drivers/char/drm/drm_memory_debug.h')
| -rw-r--r-- | drivers/char/drm/drm_memory_debug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h index 7868341817da..6543b9a14c42 100644 --- a/drivers/char/drm/drm_memory_debug.h +++ b/drivers/char/drm/drm_memory_debug.h @@ -229,6 +229,7 @@ void *drm_ioremap (unsigned long offset, unsigned long size, return pt; } +#if 0 void *drm_ioremap_nocache (unsigned long offset, unsigned long size, drm_device_t * dev) { void *pt; @@ -251,6 +252,7 @@ void *drm_ioremap_nocache (unsigned long offset, unsigned long size, spin_unlock(&drm_mem_lock); return pt; } +#endif /* 0 */ void drm_ioremapfree (void *pt, unsigned long size, drm_device_t * dev) { int alloc_count; |