From bf39825ce9dd42f65ce42872d15e7c47e9ffb482 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 9 Jul 2007 18:52:00 +0200
Subject: [PATCH] --- yaml --- r: 58291 b: refs/heads/master c:
 dff06c157b6089b774514337769a3c1b7ccccf6c h: refs/heads/master i:   58289:
 30f616f6d7aec9257f1558ff2558d40ba20b6e89   58287:
 fe2375f5731f9282cb5b183ec5b82e7e53bd4b49 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 460fae81cb7b..3e71d2f293ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad46c2c4ebcead75cd364a79b63b134393094fb9
+refs/heads/master: dff06c157b6089b774514337769a3c1b7ccccf6c
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 2d23450e7614..7ce959e0b69a 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <linux/nmi.h>
 #include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/highmem.h>
 #include <linux/smp_lock.h>
 #include <asm/mmu_context.h>
@@ -53,9 +53,9 @@
 #include <linux/kprobes.h>
 #include <linux/delayacct.h>
 #include <linux/reciprocal_div.h>
+#include <linux/unistd.h>
 
 #include <asm/tlb.h>
-#include <asm/unistd.h>
 
 /*
  * Scheduler clock - returns current time in nanosec units.