Index: arch/amd64/include/cpuid.h
===================================================================
--- arch/amd64/include/cpuid.h	(revision ecbdc7245534ef719f1c33d657c2cee6ab034ab6)
+++ arch/amd64/include/cpuid.h	(revision 7d53ef4494143ea6f3a781574dbddc99d2b181a4)
@@ -27,6 +27,6 @@
  */
 
-#ifndef __CPUID_H__
-#define __CPUID_H__
+#ifndef __amd64_CPUID_H__
+#define __amd64_CPUID_H__
 
 #define AMD_CPUID_EXTENDED   0x80000001