diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 02:39:47 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 02:39:47 -0400 |
| commit | 7ea5db8efeac8627500e012aa6829ca612c5a700 (patch) | |
| tree | 90e4de22f60b989dcf0f0d7436978c0b463d5827 /arch/ia64/Kconfig | |
| parent | eee7631fdf8ae63c4f24daf66981ac1a7b55d7fd (diff) | |
| parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
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 fcf3b437a2d9..c4ea0925cdbd 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -26,6 +26,7 @@ config IA64 | |||
| 26 | select GENERIC_IRQ_PROBE | 26 | select GENERIC_IRQ_PROBE |
| 27 | select GENERIC_PENDING_IRQ if SMP | 27 | select GENERIC_PENDING_IRQ if SMP |
| 28 | select IRQ_PER_CPU | 28 | select IRQ_PER_CPU |
| 29 | select GENERIC_IRQ_SHOW | ||
| 29 | default y | 30 | default y |
| 30 | help | 31 | help |
| 31 | The Itanium Processor Family is Intel's 64-bit successor to | 32 | The Itanium Processor Family is Intel's 64-bit successor to |