diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-07-04 17:58:23 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-07-04 17:58:23 +0200 |
| commit | 8fbac88a9c801be025c283275f2eb6585a5cc454 (patch) | |
| tree | bd82f6b1848d218e56f57805fdc569b9574e8089 /linux/drivers/media/video/usbvideo/konicawc.c | |
| parent | c0b0560a9ed6e97eca6da5f8432c0dbb2fe471ad (diff) | |
| parent | 54b507ede0a1c5349b47f84af7d3d0b417467e3a (diff) | |
| download | mediapointer-dvb-s2-8fbac88a9c801be025c283275f2eb6585a5cc454.tar.gz mediapointer-dvb-s2-8fbac88a9c801be025c283275f2eb6585a5cc454.tar.bz2 | |
sync with master
From: Patrick Boettcher <pb@linuxtv.org>
sync with master
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/usbvideo/konicawc.c')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/konicawc.c | 5 |
1 files changed, 5 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" |