git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
videocodec.c
diff --git
a/drivers/media/video/videocodec.c
b/drivers/media/video/videocodec.c
index
8f271de
..
290e641
100644
(file)
--- a/
drivers/media/video/videocodec.c
+++ b/
drivers/media/video/videocodec.c
@@
-36,7
+36,6
@@
#include <linux/slab.h>
// kernel config is here (procfs flag)
#include <linux/slab.h>
// kernel config is here (procfs flag)
-#include <linux/config.h>
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
@@
-347,7
+346,7
@@
videocodec_build_table (void)
size);
kfree(videocodec_buf);
size);
kfree(videocodec_buf);
- videocodec_buf =
(char *)
kmalloc(size, GFP_KERNEL);
+ videocodec_buf = kmalloc(size, GFP_KERNEL);
i = 0;
i += scnprintf(videocodec_buf + i, size - 1,
i = 0;
i += scnprintf(videocodec_buf + i, size - 1,