2 files changed, 3 insertions, 5 deletions

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 694d1d80ff3f..dcda5291b990 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -494,8 +494,7 @@ static int restart_video_queue(struct cx8800_dev    *dev,
                         return 0;
                 buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);
                 if (NULL == prev) {
-                        list_del(&buf->vb.queue);
-                        list_add_tail(&buf->vb.queue,&q->active);
+                        list_move_tail(&buf->vb.queue, &q->active);
                         start_video_dma(dev, q, buf);
                         buf->vb.state = STATE_ACTIVE;
                         buf->count    = q->count++;
@@ -506,8 +505,7 @@ static int restart_video_queue(struct cx8800_dev    *dev,
                 } else if (prev->vb.width  == buf->vb.width  &&
                            prev->vb.height == buf->vb.height &&
                            prev->fmt       == buf->fmt) {
-                        list_del(&buf->vb.queue);
-                        list_add_tail(&buf->vb.queue,&q->active);
+                        list_move_tail(&buf->vb.queue, &q->active);
                         buf->vb.state = STATE_ACTIVE;
                         buf->count    = q->count++;
                         prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index 3f3182a24da1..56e01b622417 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -33,7 +33,7 @@
 #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"
 #include "quickcam_messenger.h"