powerpc: clean up after powermac build merge

[linux-2.6] / arch / ppc64 / kernel / traps.c

diff --git a/arch/ppc64/kernel/traps.c b/arch/ppc64/kernel/traps.c
index 5c4647b2c5f3cbf3cf3ef87f18acaea9d32045a0..a728c9f0b53fedde54ae54fadd6f932ae3b272d6 100644 (file)
--- a/arch/ppc64/kernel/traps.c
+++ b/arch/ppc64/kernel/traps.c
@@ -62,7 +62,7 @@ EXPORT_SYMBOL(__debugger_dabr_match);
 EXPORT_SYMBOL(__debugger_fault_handler);
 #endif
 
-struct notifier_block *ppc64_die_chain;
+struct notifier_block *powerpc_die_chain;
 static DEFINE_SPINLOCK(die_notifier_lock);
 
 int register_die_notifier(struct notifier_block *nb)
@@ -71,7 +71,7 @@ int register_die_notifier(struct notifier_block *nb)
        unsigned long flags;
 
        spin_lock_irqsave(&die_notifier_lock, flags);
-       err = notifier_chain_register(&ppc64_die_chain, nb);
+       err = notifier_chain_register(&powerpc_die_chain, nb);
        spin_unlock_irqrestore(&die_notifier_lock, flags);
        return err;
 }