diff --git a/arch/x86/oprofile/Makefile b/arch/x86/oprofile/Makefile
index 30f3eb366667..446902b2a6b6 100644
--- a/arch/x86/oprofile/Makefile
+++ b/arch/x86/oprofile/Makefile
@@ -7,6 +7,6 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
 		timer_int.o )
 
 oprofile-y				:= $(DRIVER_OBJS) init.o backtrace.o
-oprofile-$(CONFIG_X86_LOCAL_APIC) 	+= nmi_int.o op_model_athlon.o \
+oprofile-$(CONFIG_X86_LOCAL_APIC) 	+= nmi_int.o op_model_amd.o \
 					   op_model_ppro.o op_model_p4.o
 oprofile-$(CONFIG_X86_IO_APIC)		+= nmi_timer_int.o
diff --git a/arch/x86/oprofile/op_model_athlon.c b/arch/x86/oprofile/op_model_amd.c
similarity index 99%
rename from arch/x86/oprofile/op_model_athlon.c
rename to arch/x86/oprofile/op_model_amd.c
index fb6015c1132b..d9faf607b3a6 100644
--- a/arch/x86/oprofile/op_model_athlon.c
+++ b/arch/x86/oprofile/op_model_amd.c
@@ -1,5 +1,5 @@
 /*
- * @file op_model_athlon.c
+ * @file op_model_amd.c
  * athlon / K7 / K8 / Family 10h model-specific MSR operations
  *
  * @remark Copyright 2002-2008 OProfile authors