summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/stv0297.c
diff options
context:
space:
mode:
authorJeff Garzik2005-11-05 20:38:55 +0100
committerJeff Garzik2005-11-05 20:38:55 +0100
commit328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch)
tree9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/media/dvb/frontends/stv0297.c
parentMerge branch 'master' (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 (diff)
downloadkernel-qcow2-linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.gz
kernel-qcow2-linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.xz
kernel-qcow2-linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip
Merge branch 'master'
Diffstat (limited to 'drivers/media/dvb/frontends/stv0297.c')
-rw-r--r--drivers/media/dvb/frontends/stv0297.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 8d09afd7545d..6122ba754bc5 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -24,6 +24,8 @@
#include <linux/module.h>
#include <linux/string.h>
#include <linux/delay.h>
+#include <linux/jiffies.h>
+#include <linux/slab.h>
#include "dvb_frontend.h"
#include "stv0297.h"