From 54de9fedece588590a348587ca1d3190aa31c1b6 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 18 Sep 2009 23:55:55 +0400
Subject: [PATCH] --- yaml --- r: 163629 b: refs/heads/master c:
 6952b61de9984073289859073e8195ad0bee8fd5 h: refs/heads/master i:   163627:
 521fb27b6434493928ee255fb04a77d28b7f58f6 v: v3

---
 [refs]                               | 2 +-
 trunk/include/linux/delayacct.h      | 1 -
 trunk/include/linux/taskstats_kern.h | 1 -
 trunk/kernel/delayacct.c             | 1 +
 trunk/mm/memory.c                    | 1 +
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 747ba268a337..58bbfa297ce2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6423133bdee0e07d1c2f8411cb3fe676c207ba33
+refs/heads/master: 6952b61de9984073289859073e8195ad0bee8fd5
diff --git a/trunk/include/linux/delayacct.h b/trunk/include/linux/delayacct.h
index f352f06fa063..5076fe0c8a96 100644
--- a/trunk/include/linux/delayacct.h
+++ b/trunk/include/linux/delayacct.h
@@ -18,7 +18,6 @@
 #define _LINUX_DELAYACCT_H
 
 #include <linux/sched.h>
-#include <linux/taskstats_kern.h>
 
 /*
  * Per-task flags relevant to delay accounting
diff --git a/trunk/include/linux/taskstats_kern.h b/trunk/include/linux/taskstats_kern.h
index 7e9680f4afdd..3398f4553269 100644
--- a/trunk/include/linux/taskstats_kern.h
+++ b/trunk/include/linux/taskstats_kern.h
@@ -9,7 +9,6 @@
 
 #include <linux/taskstats.h>
 #include <linux/sched.h>
-#include <net/genetlink.h>
 
 #ifdef CONFIG_TASKSTATS
 extern struct kmem_cache *taskstats_cache;
diff --git a/trunk/kernel/delayacct.c b/trunk/kernel/delayacct.c
index abb6e17505e2..ead9b610aa71 100644
--- a/trunk/kernel/delayacct.c
+++ b/trunk/kernel/delayacct.c
@@ -15,6 +15,7 @@
 
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/taskstats.h>
 #include <linux/time.h>
 #include <linux/sysctl.h>
 #include <linux/delayacct.h>
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index aede2ce3aba4..e8f63d9961ea 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -56,6 +56,7 @@
 #include <linux/swapops.h>
 #include <linux/elf.h>
 
+#include <asm/io.h>
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>
 #include <asm/tlb.h>