summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/pt1
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-05-08 23:59:58 +0200
committerH. Peter Anvin <hpa@zytor.com>2010-05-08 23:59:58 +0200
commitd7be0ce6afb1df60bc786f57410407ceae92b994 (patch)
tree5e91acfc12c833531ad3320f274e0cd96a129973 /drivers/media/dvb/pt1
parentx86: Clean up the hypervisor layer (diff)
parentLinux 2.6.34-rc6 (diff)
downloadlinux-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz
linux-d7be0ce6afb1df60bc786f57410407ceae92b994.zip
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'drivers/media/dvb/pt1')
-rw-r--r--drivers/media/dvb/pt1/pt1.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/pt1/pt1.c b/drivers/media/dvb/pt1/pt1.c
index 81e623a90f09..6aded234aa61 100644
--- a/drivers/media/dvb/pt1/pt1.c
+++ b/drivers/media/dvb/pt1/pt1.c
@@ -23,6 +23,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/pci.h>
#include <linux/kthread.h>