diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /drivers/media/video/cx23885/cx23885-vbi.c | |
parent | ALSA: i2c: Fixed 8 checkpatch errors (diff) | |
parent | ALSA: Release v1.0.23 (diff) | |
download | linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.xz linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.zip |
Merge remote branch 'alsa/devel' into topic/misc
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" |