From 7821c0cbdf458a2a2fee2755d9f8521229473c33 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Tue, 26 Jan 2010 11:40:01 +0000
Subject: [PATCH] --- yaml --- r: 183735 b: refs/heads/master c:
 c39f01d7883f944ae75961cc1a31d348c7970599 h: refs/heads/master i:   183733:
 9fa1e4b226ac49ab14af4791f000fc8ac35e70c8   183731:
 2e47ff48ec1bb262d9880304db5b760b6b61376e   183727:
 45b8d6329b27d8965b5e44e5b3fd49cd54377d86 v: v3

---
 [refs]               | 2 +-
 trunk/net/atm/addr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eba3b1537ff8..39f359adc349 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99824461ea72ca0044cc6508f02c0e1cabf37ba5
+refs/heads/master: c39f01d7883f944ae75961cc1a31d348c7970599
diff --git a/trunk/net/atm/addr.c b/trunk/net/atm/addr.c
index 82e85abc303d..cf3ae8b47572 100644
--- a/trunk/net/atm/addr.c
+++ b/trunk/net/atm/addr.c
@@ -4,7 +4,7 @@
 
 #include <linux/atm.h>
 #include <linux/atmdev.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include "signaling.h"
 #include "addr.h"