From c8ce72ff5b856350766bfe8d0b8f3276fc4d3cba Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 31 Jan 2008 22:05:48 +0100
Subject: [PATCH] --- yaml --- r: 81445 b: refs/heads/master c:
 62152d0ea7012382cd814c7b361b4ef2029f26e6 h: refs/heads/master i:   81443:
 dc2baa40d53f1b68a2af9b6d3dc509b604876f37 v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-generic/tlb.h | 1 +
 trunk/include/linux/swap.h      | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7729d72ab458..a7cdf1b6017c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aa0508508e7cd62bec6e3933b86fce03d2e8502
+refs/heads/master: 62152d0ea7012382cd814c7b361b4ef2029f26e6
diff --git a/trunk/include/asm-generic/tlb.h b/trunk/include/asm-generic/tlb.h
index 6ce9f3ab928d..75f2bfab614f 100644
--- a/trunk/include/asm-generic/tlb.h
+++ b/trunk/include/asm-generic/tlb.h
@@ -15,6 +15,7 @@
 
 #include <linux/swap.h>
 #include <linux/quicklist.h>
+#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
 /*
diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
index 2c3ce4c69b25..4f3838adbb30 100644
--- a/trunk/include/linux/swap.h
+++ b/trunk/include/linux/swap.h
@@ -6,7 +6,6 @@
 #include <linux/mmzone.h>
 #include <linux/list.h>
 #include <linux/sched.h>
-#include <linux/pagemap.h>
 
 #include <asm/atomic.h>
 #include <asm/page.h>