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/ppc/platforms | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/ppc/platforms')
| -rw-r--r-- | arch/ppc/platforms/prep_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c index fa46f8ce5c71..e86f6156d589 100644 --- 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) | |||
| 736 | hex = 0xfff; | 736 | hex = 0xfff; |
| 737 | if (!notifier_installed) { | 737 | if (!notifier_installed) { |
| 738 | ++notifier_installed; | 738 | ++notifier_installed; |
| 739 | notifier_chain_register(&panic_notifier_list, | 739 | atomic_notifier_chain_register(&panic_notifier_list, |
| 740 | &ibm_statusled_block); | 740 | &ibm_statusled_block); |
| 741 | } | 741 | } |
| 742 | } | 742 | } |