git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
i386
/
Kconfig
diff --git
a/arch/i386/Kconfig
b/arch/i386/Kconfig
index
b44faa2
..
51f5417
100644
(file)
--- a/
arch/i386/Kconfig
+++ b/
arch/i386/Kconfig
@@
-436,7
+436,8
@@
config HPET_TIMER
Choose N to continue using the legacy 8254 timer.
config HPET_EMULATE_RTC
Choose N to continue using the legacy 8254 timer.
config HPET_EMULATE_RTC
- def_bool HPET_TIMER && RTC=y
+ bool "Provide RTC interrupt"
+ depends on HPET_TIMER && RTC=y
config SMP
bool "Symmetric multi-processing support"
config SMP
bool "Symmetric multi-processing support"
@@
-1337,12
+1338,6
@@
config X86_TRAMPOLINE
depends on X86_SMP || (X86_VOYAGER && SMP)
default y
depends on X86_SMP || (X86_VOYAGER && SMP)
default y
-# std_resources is overridden for pc9800, but that's not
-# a currently selectable arch choice
-config X86_STD_RESOURCES
- bool
- default y
-
config PC
bool
depends on X86 && !EMBEDDED
config PC
bool
depends on X86 && !EMBEDDED