ia64/xen-unstable

changeset 14258:d99e6b6c294d

[LINUX] CONFIG_X86_TSC is defined upstream in arch/i386/Kconfig.cpu so use that
instead of duplicating it in arch/i386/Kconfig.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Mon Mar 05 14:04:45 2007 +0000 (2007-03-05)
parents 2caed72258e8
children 4159a8a43a97
files linux-2.6-xen-sparse/arch/i386/Kconfig linux-2.6-xen-sparse/arch/i386/Kconfig.cpu
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig	Mon Mar 05 14:00:05 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig	Mon Mar 05 14:04:45 2007 +0000
     1.3 @@ -312,11 +312,6 @@ config X86_VISWS_APIC
     1.4  	depends on X86_VISWS
     1.5  	default y
     1.6  
     1.7 -config X86_TSC
     1.8 -	bool
     1.9 -	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && !X86_XEN
    1.10 -	default y
    1.11 -
    1.12  config X86_MCE
    1.13  	bool "Machine Check Exception"
    1.14  	depends on !(X86_VOYAGER || X86_XEN)
     2.1 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig.cpu	Mon Mar 05 14:00:05 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig.cpu	Mon Mar 05 14:04:45 2007 +0000
     2.3 @@ -311,5 +311,5 @@ config X86_OOSTORE
     2.4  
     2.5  config X86_TSC
     2.6  	bool
     2.7 -	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ
     2.8 +	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN
     2.9  	default y