summaryrefslogtreecommitdiff
path: root/drivers/media/video/cx88/cx88-vbi.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-03 17:25:35 +0400
committerJiri Kosina <jkosina@suse.cz>2010-05-03 17:25:35 +0400
commitd6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch)
tree1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/media/video/cx88/cx88-vbi.c
parent0b5adf92ec793c665b0de63ac146d190a921c391 (diff)
parent6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff)
downloadlinux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.xz
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/media/video/cx88/cx88-vbi.c')
-rw-r--r--drivers/media/video/cx88/cx88-vbi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index 0943060682bc..d9445b0e7ab2 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -3,7 +3,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/slab.h>
#include "cx88.h"