diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-08 07:25:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-08 07:25:08 -0300 |
| commit | c13f70467621e2c352f93b336b382e70ea24d218 (patch) | |
| tree | 582367340fe7529eb3fec3c514ec9d4b2f68ff71 /linux/drivers/media/video/usbvideo/konicawc.c | |
| parent | a953cf4edb8db13f8b7d20c793696a13ffcd3333 (diff) | |
| parent | 9380e197397e3f8404fa2d2effe5c84b6f56735b (diff) | |
| download | mediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.gz mediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/usbvideo/konicawc.c')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/konicawc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c index 7e2f04fb4..6fef59557 100644 --- a/linux/drivers/media/video/usbvideo/konicawc.c +++ b/linux/drivers/media/video/usbvideo/konicawc.c @@ -17,10 +17,8 @@ #include <linux/init.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) #include <linux/usb/input.h> -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13) -#include <linux/usb_input.h> #else -#include <linux/input.h> +#include <linux/usb_input.h> #endif #include "usbvideo.h" |