summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/usbvideo/quickcam_messenger.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 17:48:22 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 17:48:22 -0300
commitabb5bd3be0a8848a352da170173f833f4c648098 (patch)
tree5e0ca14b3c5d3e1ab6cd6b7c8cc36412911aec19 /linux/drivers/media/video/usbvideo/quickcam_messenger.c
parentd63e2dd7f61467a69001f23e106a707a3e6a93d8 (diff)
downloadmediapointer-dvb-s2-abb5bd3be0a8848a352da170173f833f4c648098.tar.gz
mediapointer-dvb-s2-abb5bd3be0a8848a352da170173f833f4c648098.tar.bz2
Update this driver for recent header file movement.
From: Andrew Morton <akpm@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvideo/quickcam_messenger.c')
-rw-r--r--linux/drivers/media/video/usbvideo/quickcam_messenger.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.c b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
index 3f3182a24..4d8465037 100644
--- a/linux/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -33,7 +33,11 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/input.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <linux/usb_input.h>
+#else
+#include <linux/usb/input.h>
+#endif
#include "usbvideo.h"
#include "quickcam_messenger.h"