diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /arch/ppc64/Kconfig | |
parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'arch/ppc64/Kconfig')
-rw-r--r-- | arch/ppc64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index fdd8afba7152..2ce87836c671 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig | |||
@@ -288,6 +288,7 @@ config SCHED_SMT | |||
288 | overhead in some places. If unsure say N here. | 288 | overhead in some places. If unsure say N here. |
289 | 289 | ||
290 | source "kernel/Kconfig.preempt" | 290 | source "kernel/Kconfig.preempt" |
291 | source kernel/Kconfig.hz | ||
291 | 292 | ||
292 | config EEH | 293 | config EEH |
293 | bool "PCI Extended Error Handling (EEH)" if EMBEDDED | 294 | bool "PCI Extended Error Handling (EEH)" if EMBEDDED |