From 9841c79c890cf7ef9ffa2c86c9924113c9a88244 Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Fri, 17 Jan 2014 18:36:38 -0600
Subject: [PATCH] powerpc/booke64: Guard e6500 tlb handler with
 CONFIG_PPC_FSL_BOOK3E

...and make CONFIG_PPC_FSL_BOOK3E conflict with CONFIG_PPC_64K_PAGES.

This fixes a build break with CONFIG_PPC_64K_PAGES on 64-bit book3e,
that was introduced by commit 28efc35fe68dacbddc4b12c2fa8f2df1593a4ad3
("powerpc/e6500: TLB miss handler with hardware tablewalk support").

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
Reading git-format-patch failed