Annotation of /trunk/kernel26-xen/patches-2.6.25-r1/1016-2.6.25-xen-fixup-kconfig.patch
Parent Directory
| 
Revision Log
Revision 609 -
(hide annotations)
(download)
Fri May 23 17:35:37 2008 UTC (16 years ago) by niro
File size: 1689 byte(s)
Fri May 23 17:35:37 2008 UTC (16 years ago) by niro
File size: 1689 byte(s)
-using opensuse xen patchset, updated kernel configs
| 1 | niro | 609 | Subject: Fix xen configuration. |
| 2 | From: jbeulich@novell.com | ||
| 3 | Patch-mainline: obsolete | ||
| 4 | |||
| 5 | --- | ||
| 6 | arch/x86/Kconfig | 5 +++-- | ||
| 7 | arch/x86/Kconfig.debug | 2 +- | ||
| 8 | drivers/cpufreq/Kconfig | 1 + | ||
| 9 | drivers/video/Kconfig | 2 +- | ||
| 10 | 4 files changed, 6 insertions(+), 4 deletions(-) | ||
| 11 | |||
| 12 | --- a/arch/x86/Kconfig | ||
| 13 | +++ b/arch/x86/Kconfig | ||
| 14 | @@ -135,6 +135,7 @@ | ||
| 15 | config ARCH_HIBERNATION_POSSIBLE | ||
| 16 | def_bool y | ||
| 17 | depends on !SMP || !X86_VOYAGER | ||
| 18 | + depends on !X86_XEN && !X86_64_XEN | ||
| 19 | |||
| 20 | config ARCH_SUSPEND_POSSIBLE | ||
| 21 | def_bool y | ||
| 22 | @@ -189,7 +190,7 @@ | ||
| 23 | |||
| 24 | config X86_BIOS_REBOOT | ||
| 25 | bool | ||
| 26 | - depends on X86_32 && !(X86_VISWS || X86_VOYAGER) | ||
| 27 | + depends on X86_32 && !(X86_VISWS || X86_VOYAGER || X86_XEN) | ||
| 28 | default y | ||
| 29 | |||
| 30 | config X86_TRAMPOLINE | ||
| 31 | @@ -714,7 +715,7 @@ | ||
| 32 | config X86_REBOOTFIXUPS | ||
| 33 | def_bool n | ||
| 34 | prompt "Enable X86 board specific fixups for reboot" | ||
| 35 | - depends on X86_32 && X86 | ||
| 36 | + depends on X86_32 && !X86_XEN | ||
| 37 | ---help--- | ||
| 38 | This enables chipset and/or board specific fixups to be done | ||
| 39 | in order to get reboot to work correctly. This is only needed on | ||
| 40 | --- a/drivers/cpufreq/Kconfig | ||
| 41 | +++ b/drivers/cpufreq/Kconfig | ||
| 42 | @@ -1,5 +1,6 @@ | ||
| 43 | config CPU_FREQ | ||
| 44 | bool "CPU Frequency scaling" | ||
| 45 | + depends on !XEN | ||
| 46 | help | ||
| 47 | CPU Frequency scaling allows you to change the clock speed of | ||
| 48 | CPUs on the fly. This is a nice method to save power, because | ||
| 49 | --- a/drivers/video/Kconfig | ||
| 50 | +++ b/drivers/video/Kconfig | ||
| 51 | @@ -1554,7 +1554,7 @@ | ||
| 52 | tristate "Cyberblade/i1 support" | ||
| 53 | depends on FB && PCI && X86_32 && !64BIT | ||
| 54 | select FB_CFB_IMAGEBLIT | ||
| 55 | - select VIDEO_SELECT | ||
| 56 | + select VIDEO_SELECT if !XEN | ||
| 57 | ---help--- | ||
| 58 | This driver is supposed to support the Trident Cyberblade/i1 | ||
| 59 | graphics core integrated in the VIA VT8601A North Bridge, |