diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/media/video/cx23885/cx23885-vbi.c | |
parent | HID: split picolcd's operation_mode sysfs attribute (diff) | |
parent | HID: add suspend/resume hooks for hid drivers (diff) | |
download | linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.xz linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.zip |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-vbi.c')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-vbi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c index 5b297f0323b6..708a8c766d1a 100644 --- a/drivers/media/video/cx23885/cx23885-vbi.c +++ b/drivers/media/video/cx23885/cx23885-vbi.c @@ -23,7 +23,6 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/init.h> -#include <linux/slab.h> #include "cx23885.h" |