Merge linux-2.6 with linux-acpi-2.6

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/i386/oprofile/init.c b/arch/i386/oprofile/init.c
index c90332de582b..5341d481d92f 100644
--- a/arch/i386/oprofile/init.c
+++ b/arch/i386/oprofile/init.c
@@ -15,9 +15,9 @@
  * with the NMI mode driver.
  */
  
-extern int nmi_init(struct oprofile_operations * ops);
-extern int nmi_timer_init(struct oprofile_operations * ops);
-extern void nmi_exit(void);
+extern int op_nmi_init(struct oprofile_operations * ops);
+extern int op_nmi_timer_init(struct oprofile_operations * ops);
+extern void op_nmi_exit(void);
 extern void x86_backtrace(struct pt_regs * const regs, unsigned int depth);
 
 
@@ -28,11 +28,11 @@ int __init oprofile_arch_init(struct oprofile_operations * ops)
         ret = -ENODEV;
 
 #ifdef CONFIG_X86_LOCAL_APIC
-        ret = nmi_init(ops);
+        ret = op_nmi_init(ops);
 #endif
 #ifdef CONFIG_X86_IO_APIC
         if (ret < 0)
-                ret = nmi_timer_init(ops);
+                ret = op_nmi_timer_init(ops);
 #endif
         ops->backtrace = x86_backtrace;
 
@@ -43,6 +43,6 @@ int __init oprofile_arch_init(struct oprofile_operations * ops)
 void oprofile_arch_exit(void)
 {
 #ifdef CONFIG_X86_LOCAL_APIC
-        nmi_exit();
+        op_nmi_exit();
 #endif
 }