]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - arch/i386/kernel/Makefile
Merge branch 'x86-64'
[linux-2.6.git] / arch / i386 / kernel / Makefile
index 0fac85df64f1d51f4274aefd4cf3ff750427cc08..5e70c2fb273ae0a814f7148f61522a6f9040e02f 100644 (file)
@@ -37,6 +37,7 @@ obj-$(CONFIG_DOUBLEFAULT)     += doublefault.o
 obj-$(CONFIG_VM86)             += vm86.o
 obj-$(CONFIG_EARLY_PRINTK)     += early_printk.o
 obj-$(CONFIG_HPET_TIMER)       += hpet.o
+obj-$(CONFIG_K8_NB)            += k8.o
 
 EXTRA_AFLAGS   := -traditional
 
@@ -76,3 +77,6 @@ SYSCFLAGS_vsyscall-syms.o = -r
 $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
                        $(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE
        $(call if_changed,syscall)
+
+k8-y                      += ../../x86_64/kernel/k8.o
+