Merge

diff --cc arch/i386/Kconfig
index b8510c8addb24aefc71ea2131c261ee69ebfff81,68a522c910b8f7bbcc7fc3d356e91db1d09e529f..9aff927ee623f8b0b701b386b592dd6511394dbe
--- 1/arch/i386/Kconfig
--- 2/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@@ -280,9 -260,14 +287,9 @@@ config X86_ALIGNMENT_1
        depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486
        default y
  
 -config X86_TSC
 -      bool
 -      depends on MWINCHIP3D || MWINCHIP2 || MCRUSOE || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMIII || M686 || M586MMX || M586TSC || MK8
 -      default y
 -
  config X86_GOOD_APIC
        bool
-       depends on MK7 || MPENTIUM4 || MPENTIUMIII || M686 || M586MMX
+       depends on MK7 || MPENTIUM4 || MPENTIUMIII || M686 || M586MMX || MK8
        default y
  
  config X86_INTEL_USERCOPY

diff --cc arch/i386/Makefile
Simple merge

diff --cc include/asm-i386/processor.h
Simple merge