diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /arch/parisc/kernel/pdc_chassis.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/parisc/kernel/pdc_chassis.c')
| -rw-r--r-- | arch/parisc/kernel/pdc_chassis.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/kernel/pdc_chassis.c b/arch/parisc/kernel/pdc_chassis.c index 2a01fe1bdc98..0cea6958f427 100644 --- a/arch/parisc/kernel/pdc_chassis.c +++ b/arch/parisc/kernel/pdc_chassis.c | |||
| @@ -150,7 +150,8 @@ void __init parisc_pdc_chassis_init(void) | |||
| 150 | 150 | ||
| 151 | if (handle) { | 151 | if (handle) { |
| 152 | /* initialize panic notifier chain */ | 152 | /* initialize panic notifier chain */ |
| 153 | notifier_chain_register(&panic_notifier_list, &pdc_chassis_panic_block); | 153 | atomic_notifier_chain_register(&panic_notifier_list, |
| 154 | &pdc_chassis_panic_block); | ||
| 154 | 155 | ||
| 155 | /* initialize reboot notifier chain */ | 156 | /* initialize reboot notifier chain */ |
| 156 | register_reboot_notifier(&pdc_chassis_reboot_block); | 157 | register_reboot_notifier(&pdc_chassis_reboot_block); |