From fbe46cd26653263628719a4021069a0d6f7752a2 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 1 Mar 2012 19:56:29 -0300
Subject: [PATCH] --- yaml --- r: 295060 b: refs/heads/master c:
 66ede038aa7b51ffbfaf9e600536f027a6d34e56 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/uvc/uvc_driver.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 02c9dd33eb05..2aabcb5bd33e 100644
--- 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
index 7077d5ef58a4..1d131720b6d7 100644
--- 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>