From 3590d8a29d3f6b26245facdab5d93003f1894779 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Wed, 6 Dec 2006 20:33:50 -0800
Subject: [PATCH] --- yaml --- r: 42704 b: refs/heads/master c:
 e9c1528a429c831458e54c8701a0b80ba563a7a8 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/frv/kernel/futex.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6ef68cf442b0..8cde7269c7c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48ad504ee7d598431cb2d0b2f01c6d1aff1d2a07
+refs/heads/master: e9c1528a429c831458e54c8701a0b80ba563a7a8
diff --git a/trunk/arch/frv/kernel/futex.c b/trunk/arch/frv/kernel/futex.c
index 53dc5ed1ebda..14f64b054c7e 100644
--- a/trunk/arch/frv/kernel/futex.c
+++ b/trunk/arch/frv/kernel/futex.c
@@ -10,9 +10,9 @@
  */
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 #include <asm/futex.h>
 #include <asm/errno.h>
-#include <asm/uaccess.h>
 
 /*
  * the various futex operations; MMU fault checking is ignored under no-MMU