summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/usbvideo
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/usbvideo')
-rw-r--r--linux/drivers/media/video/usbvideo/konicawc.c5
-rw-r--r--linux/drivers/media/video/usbvideo/quickcam_messenger.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c
index c11f5d46b..1feaf5f0b 100644
--- a/linux/drivers/media/video/usbvideo/konicawc.c
+++ b/linux/drivers/media/video/usbvideo/konicawc.c
@@ -15,8 +15,13 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
+#include "compat.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"
diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.c b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
index 3f3182a24..66e750336 100644
--- a/linux/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -33,7 +33,12 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/input.h>
+#include "compat.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"