diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-04-17 13:14:51 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-04-17 13:14:51 -0400 |
| commit | 71b264f85ff50c14fe945ffff06ae0d5e9a9124e (patch) | |
| tree | 9fd79c63fd630c4d030a97d254d42a3a73f1328b /arch/ia64/Kconfig | |
| parent | f4df39cbdd9e9ab615e80148cc271db22a8508ad (diff) | |
| parent | 072f042df335d7e0da2027637bcf720d7ff1589b (diff) | |
Pull miscellaneous into release branch
Conflicts:
arch/ia64/kernel/mca.c
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index eef457fda08f..ed21737a00c5 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -622,6 +622,9 @@ config IRQ_PER_CPU | |||
| 622 | bool | 622 | bool |
| 623 | default y | 623 | default y |
| 624 | 624 | ||
| 625 | config IOMMU_HELPER | ||
| 626 | def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC) | ||
| 627 | |||
| 625 | source "arch/ia64/hp/sim/Kconfig" | 628 | source "arch/ia64/hp/sim/Kconfig" |
| 626 | 629 | ||
| 627 | source "arch/ia64/Kconfig.debug" | 630 | source "arch/ia64/Kconfig.debug" |