ia64/linux-2.6.18-xen.hg

changeset 638:099864f50909

linux: some Kconfig adjustments

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Aug 08 14:21:32 2008 +0100 (2008-08-08)
parents 59912a8aee53
children abcb2a10ff2f
files arch/i386/Kconfig drivers/char/Kconfig drivers/video/Kconfig
line diff
     1.1 --- a/arch/i386/Kconfig	Fri Aug 08 14:20:34 2008 +0100
     1.2 +++ b/arch/i386/Kconfig	Fri Aug 08 14:21:32 2008 +0100
     1.3 @@ -397,7 +397,7 @@ config I8K
     1.4  
     1.5  config X86_REBOOTFIXUPS
     1.6  	bool "Enable X86 board specific fixups for reboot"
     1.7 -	depends on X86
     1.8 +	depends on !X86_XEN
     1.9  	default n
    1.10  	---help---
    1.11  	  This enables chipset and/or board specific fixups to be done
    1.12 @@ -661,7 +661,6 @@ config MATH_EMULATION
    1.13  config MTRR
    1.14  	bool "MTRR (Memory Type Range Register) support"
    1.15  	depends on !XEN_UNPRIVILEGED_GUEST
    1.16 -	default y if X86_XEN
    1.17  	---help---
    1.18  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
    1.19  	  the Memory Type Range Registers (MTRRs) may be used to control
    1.20 @@ -781,6 +780,7 @@ config CRASH_DUMP
    1.21  	bool "kernel crash dumps (EXPERIMENTAL)"
    1.22  	depends on EXPERIMENTAL
    1.23  	depends on HIGHMEM
    1.24 +	depends on !XEN
    1.25  	help
    1.26  	  Generate crash dump after being started by kexec.
    1.27  
     2.1 --- a/drivers/char/Kconfig	Fri Aug 08 14:20:34 2008 +0100
     2.2 +++ b/drivers/char/Kconfig	Fri Aug 08 14:21:32 2008 +0100
     2.3 @@ -1005,7 +1005,7 @@ config MAX_RAW_DEVS
     2.4  config HPET
     2.5  	bool "HPET - High Precision Event Timer" if (X86 || IA64)
     2.6  	default n
     2.7 -	depends on ACPI
     2.8 +	depends on ACPI && !XEN
     2.9  	help
    2.10  	  If you say Y here, you will have a miscdevice named "/dev/hpet/".  Each
    2.11  	  open selects one of the timers supported by the HPET.  The timers are
     3.1 --- a/drivers/video/Kconfig	Fri Aug 08 14:20:34 2008 +0100
     3.2 +++ b/drivers/video/Kconfig	Fri Aug 08 14:21:32 2008 +0100
     3.3 @@ -1254,7 +1254,7 @@ config FB_CYBLA
     3.4  	tristate "Cyberblade/i1 support"
     3.5  	depends on FB && PCI && X86_32 && !64BIT
     3.6  	select FB_CFB_IMAGEBLIT
     3.7 -	select VIDEO_SELECT
     3.8 +	select VIDEO_SELECT if !XEN
     3.9  	---help---
    3.10  	  This driver is supposed to support the Trident Cyberblade/i1
    3.11  	  graphics core integrated in the VIA VT8601A North Bridge,