diff options
author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/ia64/Kconfig | |
parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r-- | arch/ia64/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index e1c9ea03f31f..00151a8320d8 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -408,6 +408,11 @@ config GENERIC_IRQ_PROBE | |||
408 | bool | 408 | bool |
409 | default y | 409 | default y |
410 | 410 | ||
411 | config GENERIC_PENDING_IRQ | ||
412 | bool | ||
413 | depends on GENERIC_HARDIRQS && SMP | ||
414 | default y | ||
415 | |||
411 | source "arch/ia64/hp/sim/Kconfig" | 416 | source "arch/ia64/hp/sim/Kconfig" |
412 | 417 | ||
413 | source "arch/ia64/oprofile/Kconfig" | 418 | source "arch/ia64/oprofile/Kconfig" |