summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pms.c
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2012-06-21 03:30:30 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-21 07:10:08 +0200
commit0e3534c0417fef6e6535db8867a04798f2024e3f (patch)
treea78b82ec42f40a79a2c27dcc7c94776f13762826 /drivers/media/video/pms.c
parentMerge tag 'staging-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-0e3534c0417fef6e6535db8867a04798f2024e3f.tar.xz
linux-0e3534c0417fef6e6535db8867a04798f2024e3f.zip
media: pms.c needs linux/slab.h
drivers/media/video/pms.c uses kzalloc() and kfree() so it should include <linux/slab.h> to fix build errors and a warning. drivers/media/video/pms.c:1047:2: error: implicit declaration of function 'kzalloc' drivers/media/video/pms.c:1047:6: warning: assignment makes pointer from integer without a cast drivers/media/video/pms.c:1116:2: error: implicit declaration of function 'kfree' Found in mmotm but applies to mainline. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Cc: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--drivers/media/video/pms.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index af2d9086d7e8..c370c2d87c17 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -29,6 +29,7 @@
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/mutex.h>
+#include <linux/slab.h>
#include <linux/uaccess.h>
#include <linux/isa.h>
#include <asm/io.h>