]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[media] uvcvideo: uvc_driver.c: use linux/atomic.h
authorAndrew Morton <akpm@linux-foundation.org>
Thu, 1 Mar 2012 22:56:29 +0000 (19:56 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 19 Mar 2012 17:08:34 +0000 (14:08 -0300)
There's no known problem here, but this is one of only two non-arch files
in the kernel which use asm/atomic.h instead of linux/atomic.h.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/uvc/uvc_driver.c

index 7077d5ef58a4cbadaf10b272cfe5f5dab125ac1c..1d131720b6d71c5ea56b34fb598223ca468f9348 100644 (file)
@@ -23,6 +23,7 @@
  * codec can't handle MJPEG data.
  */
 
+#include <linux/atomic.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/module.h>
@@ -32,7 +33,6 @@
 #include <linux/vmalloc.h>
 #include <linux/wait.h>
 #include <linux/version.h>
-#include <asm/atomic.h>
 #include <asm/unaligned.h>
 
 #include <media/v4l2-common.h>