[Xen-changelog] [xen-unstable] [LINUX] CONFIG_X86_TSC is defined upstream in arch/i386/Kconfig.cpu so use that

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1173103485 0
# Node ID d99e6b6c294de17a9d94dbce15f4241879928bed
# Parent  2caed72258e8ad786870f18a3d7216df9a9a3f8c
[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@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/i386/Kconfig     |    5 -----
 linux-2.6-xen-sparse/arch/i386/Kconfig.cpu |    4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff -r 2caed72258e8 -r d99e6b6c294d linux-2.6-xen-sparse/arch/i386/Kconfig
--- a/linux-2.6-xen-sparse/arch/i386/Kconfig    Mon Mar 05 14:00:05 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/Kconfig    Mon Mar 05 14:04:45 2007 +0000
@@ -310,11 +310,6 @@ config X86_VISWS_APIC
 config X86_VISWS_APIC
        bool
        depends on X86_VISWS
-       default y
-
-config X86_TSC
-       bool
-       depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || 
MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII 
|| M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && 
!X86_XEN
        default y
 
 config X86_MCE
diff -r 2caed72258e8 -r d99e6b6c294d linux-2.6-xen-sparse/arch/i386/Kconfig.cpu
--- a/linux-2.6-xen-sparse/arch/i386/Kconfig.cpu        Mon Mar 05 14:00:05 
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/Kconfig.cpu        Mon Mar 05 14:04:45 
2007 +0000
@@ -311,5 +311,5 @@ config X86_OOSTORE
 
 config X86_TSC
        bool
-       depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || 
MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII 
|| M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && 
!X86_NUMAQ
-       default y
+       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
+       default y

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog