summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorPatrick Boettcher <pb@linuxtv.org>2006-08-15 16:39:50 +0200
committerPatrick Boettcher <pb@linuxtv.org>2006-08-15 16:39:50 +0200
commit8ab83d48dae5d54d59e02e8c0087580aba1d6842 (patch)
tree69ebd72b8dd561af9b5af0f650fc0cb25a55326f /linux/drivers/media/video/em28xx
parent04e963dbabd077673fbc46b533246190aebb95b5 (diff)
parentaf1f59fa1dacf231cf12ff92ee3a50e0a43c47bf (diff)
downloadmediapointer-dvb-s2-8ab83d48dae5d54d59e02e8c0087580aba1d6842.tar.gz
mediapointer-dvb-s2-8ab83d48dae5d54d59e02e8c0087580aba1d6842.tar.bz2
merge from main
From: Patrick Boettcher <pb@linuxtv.org> merge from main Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c
index ff0cd9563..c7f7869f5 100644
--- a/linux/drivers/media/video/em28xx/em28xx-core.c
+++ b/linux/drivers/media/video/em28xx/em28xx-core.c
@@ -64,6 +64,7 @@ module_param(alt, int, 0644);
MODULE_PARM_DESC(alt, "alternate setting to use for video endpoint");
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#include <linux/mm.h>
static void *rvmalloc(size_t size)
{
void *mem;