From 0d660600eecb761bba64a3c3cbff1f3c105bf2a1 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Wed, 3 Oct 2007 14:41:15 +1000
Subject: [PATCH] --- yaml --- r: 67525 b: refs/heads/master c:
 84fdde5af1eca5ff170d1dff7e2681b0a50a9ecb h: refs/heads/master i:   67523:
 34d443ea9c7ca699b668fcd949459e939074bf1b v: v3

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

diff --git a/[refs] b/[refs]
index afa2bf4809dd..d659a730cdcd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd6eed3718b1b32c60a6ee5658ae6341de3177d9
+refs/heads/master: 84fdde5af1eca5ff170d1dff7e2681b0a50a9ecb
diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c
index 172dcc3849a0..9f329a8928ea 100644
--- a/trunk/arch/powerpc/kernel/prom.c
+++ b/trunk/arch/powerpc/kernel/prom.c
@@ -531,10 +531,7 @@ static struct ibm_pa_feature {
 	{CPU_FTR_CTRL, 0,		0, 3, 0},
 	{CPU_FTR_NOEXECUTE, 0,		0, 6, 0},
 	{CPU_FTR_NODSISRALIGN, 0,	1, 1, 1},
-#if 0
-	/* put this back once we know how to test if firmware does 64k IO */
 	{CPU_FTR_CI_LARGE_PAGE, 0,	1, 2, 0},
-#endif
 	{CPU_FTR_REAL_LE, PPC_FEATURE_TRUE_LE, 5, 0, 0},
 };