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"