diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 22:41:52 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 22:41:52 +0400 |
| commit | cf77e988ddfc7f047ac1ddc72cadb5eee7e09293 (patch) | |
| tree | d4870b7290ea50fe01ed4d56febad449f1206172 /arch/ia64/Kconfig | |
| parent | 1d3c6ff44ad4b5f113602e153026a338f0f9b3ff (diff) | |
| parent | 2a2ae2426bba944ce6dbcad35e1580df57aafcf1 (diff) | |
| download | linux-cf77e988ddfc7f047ac1ddc72cadb5eee7e09293.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Drop duplicated "config IOMMU_HELPER"
[IA64] invoke oom-killer from page fault
[IA64] use __ratelimit
[IA64] Use set_cpus_allowed_ptr
[IA64] Use set_cpus_allowed_ptr
[IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi
[IA64] removing redundant ifdef
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 4d4f4188cdf1..9676100b83ee 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -59,9 +59,6 @@ config NEED_DMA_MAP_STATE config SWIOTLB bool -config IOMMU_HELPER - bool - config GENERIC_LOCKBREAK def_bool n |