Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / xtensa / platform-iss / setup.c

diff --git a/arch/xtensa/platform-iss/setup.c b/arch/xtensa/platform-iss/setup.c
index 2e6dcbf0cc04f3bda7b447239f60ccb5f50215c5..23790a5610e2ac2b0bd436bc299a69d9b18c46d3 100644 (file)
--- a/arch/xtensa/platform-iss/setup.c
+++ b/arch/xtensa/platform-iss/setup.c
@@ -108,5 +108,5 @@ static struct notifier_block iss_panic_block = {
 
 void __init platform_setup(char **p_cmdline)
 {
-       notifier_chain_register(&panic_notifier_list, &iss_panic_block);
+       atomic_notifier_chain_register(&panic_notifier_list, &iss_panic_block);
 }