From cda558518e5d4df837e8d10e5cccf3aa26fde5d5 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 4 Dec 2006 17:26:44 +1000
Subject: [PATCH] --- yaml --- r: 42006 b: refs/heads/master c:
 1b9552af943f54336333c9a6e02f5ed9f18e0bcc h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/m68knommu/kernel/setup.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6b31a5eade19..81c06d185cca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6869e940c2244554ad8858f8c4f07bf7e2fd5e3d
+refs/heads/master: 1b9552af943f54336333c9a6e02f5ed9f18e0bcc
diff --git a/trunk/arch/m68knommu/kernel/setup.c b/trunk/arch/m68knommu/kernel/setup.c
index 7b21959eaeae..9cf2e4d1fc77 100644
--- a/trunk/arch/m68knommu/kernel/setup.c
+++ b/trunk/arch/m68knommu/kernel/setup.c
@@ -36,10 +36,7 @@
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/machdep.h>
-
-#ifdef CONFIG_BLK_DEV_INITRD
 #include <asm/pgtable.h>
-#endif
 
 unsigned long memory_start;
 unsigned long memory_end;