Merge by hand from Linus' tree.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/ppc/kernel/perfmon.c b/arch/ppc/kernel/perfmon.c
index f9b27d939f76..c9a38dd0cdc4 100644
--- a/arch/ppc/kernel/perfmon.c
+++ b/arch/ppc/kernel/perfmon.c
@@ -45,9 +45,8 @@ static void dummy_perf(struct pt_regs *regs)
         mtpmr(PMRN_PMGC0, pmgc0);
 }
 
-#elif CONFIG_6xx
+#elif defined(CONFIG_6xx)
 /* Ensure exceptions are disabled */
-
 static void dummy_perf(struct pt_regs *regs)
 {
         unsigned int mmcr0 = mfspr(SPRN_MMCR0);