---

yaml --- r: 67525 b: refs/heads/master c: 84fdde5 h: refs/heads/master i: 67523: 34d443e v: v3
git-mirror · Oct 9, 2007 · 0d66060 · 0d66060
1 parent 9fa4cfa
commit 0d66060
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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},
 };