Merge ../linux-2.6

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c
index eabac6cad1f5..75c645043746 100644
--- a/arch/ppc/kernel/ppc_htab.c
+++ b/arch/ppc/kernel/ppc_htab.c
@@ -52,7 +52,7 @@ static int ppc_htab_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_htab_show, NULL);
 }
 
-struct file_operations ppc_htab_operations = {
+const struct file_operations ppc_htab_operations = {
         .open           = ppc_htab_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
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)
                 hex = 0xfff;
                 if (!notifier_installed) {
                         ++notifier_installed;
-                        notifier_chain_register(&panic_notifier_list,
+                        atomic_notifier_chain_register(&panic_notifier_list,
                                                 &ibm_statusled_block);
                 }
         }