Merge ../linux-2.6

[safe/jmp/linux-2.6] / arch / ppc / platforms / prep_setup.c

diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index fa46f8c..e86f615 100644 (file)
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -736,7 +736,7 @@ ibm_statusled_progress(char *s, unsigned short hex)
                hex = 0xfff;
                if (!notifier_installed) {
                        ++notifier_installed;
-                       notifier_chain_register(&panic_notifier_list,
+                       atomic_notifier_chain_register(&panic_notifier_list,
                                                &ibm_statusled_block);
                }
        }