summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvideo
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2006-06-13 19:04:34 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-22 00:04:18 +0200
commitae0dadcf0f912cbab2ac84caa437454620bf71b2 (patch)
tree8ad54ef4ddb8615256ee71196cbfca912e647a5c /drivers/media/video/usbvideo
parent[PATCH] USB: move hardware-specific <linux/usb_*.h> to <linux/usb/*.h> (diff)
downloadlinux-ae0dadcf0f912cbab2ac84caa437454620bf71b2.tar.xz
linux-ae0dadcf0f912cbab2ac84caa437454620bf71b2.zip
[PATCH] USB: move <linux/usb_input.h> to <linux/usb/input.h>
Move <linux/usb_input.h> to <linux/usb/input.h> and remove some redundant includes. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/media/video/usbvideo')
-rw-r--r--drivers/media/video/usbvideo/konicawc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index c11f5d46b114..6f31ecc88843 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -15,8 +15,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/input.h>
-#include <linux/usb_input.h>
+#include <linux/usb/input.h>
#include "usbvideo.h"