diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:26:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:26:52 -0400 |
| commit | 4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648 (patch) | |
| tree | 9dc3fc8276d987058cd8f3826113c5baa2a1b595 /arch/ia64/Kconfig | |
| parent | 529980c8b0b04e8a3f6606cdc156f1f81a5d68cd (diff) | |
| parent | 344a076110f4ecb16ea6d286b63be696604982ed (diff) | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 00151a8320d8..ed25d66c8d50 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -339,12 +339,6 @@ config IA64_PALINFO | |||
| 339 | To use this option, you have to ensure that the "/proc file system | 339 | To use this option, you have to ensure that the "/proc file system |
| 340 | support" (CONFIG_PROC_FS) is enabled, too. | 340 | support" (CONFIG_PROC_FS) is enabled, too. |
| 341 | 341 | ||
| 342 | config ACPI_DEALLOCATE_IRQ | ||
| 343 | bool | ||
| 344 | depends on ACPI | ||
| 345 | depends on IOSAPIC && EXPERIMENTAL | ||
| 346 | default y | ||
| 347 | |||
| 348 | source "drivers/firmware/Kconfig" | 342 | source "drivers/firmware/Kconfig" |
| 349 | 343 | ||
| 350 | source "fs/Kconfig.binfmt" | 344 | source "fs/Kconfig.binfmt" |