diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
| commit | 77835492ed489c0b870f82f4c50687bd267acc0a (patch) | |
| tree | d80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /arch/ia64/Kconfig | |
| parent | af37501c792107c2bde1524bdae38d9a247b841a (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 3d31636cbafb..6183aeccecf1 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -17,6 +17,7 @@ config IA64 | |||
| 17 | select ACPI if (!IA64_HP_SIM) | 17 | select ACPI if (!IA64_HP_SIM) |
| 18 | select PM if (!IA64_HP_SIM) | 18 | select PM if (!IA64_HP_SIM) |
| 19 | select ARCH_SUPPORTS_MSI | 19 | select ARCH_SUPPORTS_MSI |
| 20 | select HAVE_UNSTABLE_SCHED_CLOCK | ||
| 20 | select HAVE_IDE | 21 | select HAVE_IDE |
| 21 | select HAVE_OPROFILE | 22 | select HAVE_OPROFILE |
| 22 | select HAVE_KPROBES | 23 | select HAVE_KPROBES |