---

yaml --- r: 295060 b: refs/heads/master c: 66ede03 h: refs/heads/master v: v3
git-mirror · Mar 19, 2012 · fbe46cd · fbe46cd
1 parent 08db415
commit fbe46cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3efe2f1b12664c075215b1e4e409346080907af6
+refs/heads/master: 66ede038aa7b51ffbfaf9e600536f027a6d34e56
diff --git a/trunk/drivers/media/video/uvc/uvc_driver.c b/trunk/drivers/media/video/uvc/uvc_driver.c
@@ -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>