[Xen-changelog] [linux-2.6.18-xen] linux: some Kconfig adjustments

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1218201692 -3600
# Node ID 099864f509099fb00b8411cc01f05587feac07f5
# Parent  59912a8aee5348d0c8064ace1f0379adc9d6d0f1
linux: some Kconfig adjustments

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 arch/i386/Kconfig     |    4 ++--
 drivers/char/Kconfig  |    2 +-
 drivers/video/Kconfig |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff -r 59912a8aee53 -r 099864f50909 arch/i386/Kconfig
--- a/arch/i386/Kconfig Fri Aug 08 14:20:34 2008 +0100
+++ b/arch/i386/Kconfig Fri Aug 08 14:21:32 2008 +0100
@@ -397,7 +397,7 @@ config I8K
 
 config X86_REBOOTFIXUPS
        bool "Enable X86 board specific fixups for reboot"
-       depends on X86
+       depends on !X86_XEN
        default n
        ---help---
          This enables chipset and/or board specific fixups to be done
@@ -661,7 +661,6 @@ config MTRR
 config MTRR
        bool "MTRR (Memory Type Range Register) support"
        depends on !XEN_UNPRIVILEGED_GUEST
-       default y if X86_XEN
        ---help---
          On Intel P6 family processors (Pentium Pro, Pentium II and later)
          the Memory Type Range Registers (MTRRs) may be used to control
@@ -781,6 +780,7 @@ config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        depends on HIGHMEM
+       depends on !XEN
        help
          Generate crash dump after being started by kexec.
 
diff -r 59912a8aee53 -r 099864f50909 drivers/char/Kconfig
--- a/drivers/char/Kconfig      Fri Aug 08 14:20:34 2008 +0100
+++ b/drivers/char/Kconfig      Fri Aug 08 14:21:32 2008 +0100
@@ -1005,7 +1005,7 @@ config HPET
 config HPET
        bool "HPET - High Precision Event Timer" if (X86 || IA64)
        default n
-       depends on ACPI
+       depends on ACPI && !XEN
        help
          If you say Y here, you will have a miscdevice named "/dev/hpet/".  
Each
          open selects one of the timers supported by the HPET.  The timers are
diff -r 59912a8aee53 -r 099864f50909 drivers/video/Kconfig
--- a/drivers/video/Kconfig     Fri Aug 08 14:20:34 2008 +0100
+++ b/drivers/video/Kconfig     Fri Aug 08 14:21:32 2008 +0100
@@ -1254,7 +1254,7 @@ config FB_CYBLA
        tristate "Cyberblade/i1 support"
        depends on FB && PCI && X86_32 && !64BIT
        select FB_CFB_IMAGEBLIT
-       select VIDEO_SELECT
+       select VIDEO_SELECT if !XEN
        ---help---
          This driver is supposed to support the Trident Cyberblade/i1
          graphics core integrated in the VIA VT8601A North Bridge,

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