summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 17:44:45 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 17:44:45 -0300
commitd63e2dd7f61467a69001f23e106a707a3e6a93d8 (patch)
tree2d047132df9c6a443f27a2680f9abeaec929025b /linux/drivers/media/video
parentfbfd6ff8a4b50e1dde9692e90d7a7f56f11bb7f7 (diff)
downloadmediapointer-dvb-s2-d63e2dd7f61467a69001f23e106a707a3e6a93d8.tar.gz
mediapointer-dvb-s2-d63e2dd7f61467a69001f23e106a707a3e6a93d8.tar.bz2
usb input headers changed to 2.6.18
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/usbvideo/konicawc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c
index c11f5d46b..2327916f8 100644
--- a/linux/drivers/media/video/usbvideo/konicawc.c
+++ b/linux/drivers/media/video/usbvideo/konicawc.c
@@ -15,8 +15,12 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <linux/input.h>
#include <linux/usb_input.h>
+#else
+#include <linux/usb/input.h>
+#endif
#include "usbvideo.h"