Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=34d19e29c9402b6149c128517f73e7773d5838bf
Commit:     34d19e29c9402b6149c128517f73e7773d5838bf
Parent:     5e4181b31366ea13b7b81ce3b0041f5710cc8b65
Author:     Thomas Gleixner <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 23 22:37:23 2007 +0200
Committer:  Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Tue Oct 23 22:37:23 2007 +0200

    x86: prepare consolidation of cpu/ related Makefiles
    
    Prepare the makefiles in x86/kernel/cpu and x86/kernel/cpu/mcheck to
    be used by the x86_64 build as well.
    
    No code change.
    
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
---
 arch/x86/kernel/cpu/Makefile        |   24 ++++++++++++------------
 arch/x86/kernel/cpu/mcheck/Makefile |    7 +++++--
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 778396c..cfdb2f3 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -2,19 +2,19 @@
 # Makefile for x86-compatible CPU details and quirks
 #
 
-obj-y  :=      common.o proc.o bugs.o
+obj-y                  := intel_cacheinfo.o addon_cpuid_features.o
 
-obj-y  +=      amd.o
-obj-y  +=      cyrix.o
-obj-y  +=      centaur.o
-obj-y  +=      transmeta.o
-obj-y  +=      intel.o intel_cacheinfo.o addon_cpuid_features.o
-obj-y  +=      nexgen.o
-obj-y  +=      umc.o
+obj-$(CONFIG_X86_32)   += common.o proc.o bugs.o
+obj-$(CONFIG_X86_32)   += amd.o
+obj-$(CONFIG_X86_32)   += cyrix.o
+obj-$(CONFIG_X86_32)   += centaur.o
+obj-$(CONFIG_X86_32)   += transmeta.o
+obj-$(CONFIG_X86_32)   += intel.o
+obj-$(CONFIG_X86_32)   += nexgen.o
+obj-$(CONFIG_X86_32)   += umc.o
 
-obj-$(CONFIG_X86_MCE)  +=      mcheck/
-
-obj-$(CONFIG_MTRR)     +=      mtrr/
-obj-$(CONFIG_CPU_FREQ) +=      cpufreq/
+obj-$(CONFIG_X86_MCE)  += mcheck/
+obj-$(CONFIG_MTRR)     += mtrr/
+obj-$(CONFIG_CPU_FREQ) += cpufreq/
 
 obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
diff --git a/arch/x86/kernel/cpu/mcheck/Makefile 
b/arch/x86/kernel/cpu/mcheck/Makefile
index f1ebe1c..1ba7e3f 100644
--- a/arch/x86/kernel/cpu/mcheck/Makefile
+++ b/arch/x86/kernel/cpu/mcheck/Makefile
@@ -1,2 +1,5 @@
-obj-y  =       mce.o k7.o p4.o p5.o p6.o winchip.o therm_throt.o
-obj-$(CONFIG_X86_MCE_NONFATAL) +=      non-fatal.o
+obj-$(CONFIG_X86_32)           =  mce.o k7.o p4.o p5.o p6.o winchip.o
+obj-$(CONFIG_X86_MCE_NONFATAL) += non-fatal.o
+
+# shared between i386 and x86_64
+obj-y                          += therm_throt.o
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to