diff options
author | Dave Jones <davej@redhat.com> | 2005-08-17 22:56:07 -0700 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2005-08-17 22:56:07 -0700 |
commit | a8b3e6f10f08f66ae1072efd087b30966a3654f6 (patch) | |
tree | 1d1409855f8ad5beabafe061c6453edd84ba94c8 /drivers/char/drm/drm_memory.c | |
parent | 46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 (diff) | |
parent | 099d44e869f1886b5eb02a5145ca97b5e4142e28 (diff) | |
download | kernel_samsung_aries-a8b3e6f10f08f66ae1072efd087b30966a3654f6.zip kernel_samsung_aries-a8b3e6f10f08f66ae1072efd087b30966a3654f6.tar.gz kernel_samsung_aries-a8b3e6f10f08f66ae1072efd087b30966a3654f6.tar.bz2 |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/drm/drm_memory.c')
-rw-r--r-- | drivers/char/drm/drm_memory.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c index 7f53f75..ace3d42 100644 --- a/drivers/char/drm/drm_memory.c +++ b/drivers/char/drm/drm_memory.c @@ -65,19 +65,6 @@ int drm_mem_info(char *buf, char **start, off_t offset, return 0; } -/** Wrapper around kmalloc() */ -void *drm_calloc(size_t nmemb, size_t size, int area) -{ - void *addr; - - addr = kmalloc(size * nmemb, GFP_KERNEL); - if (addr != NULL) - memset((void *)addr, 0, size * nmemb); - - return addr; -} -EXPORT_SYMBOL(drm_calloc); - /** Wrapper around kmalloc() and kfree() */ void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area) { |