diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-05-20 11:57:38 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-20 11:57:38 +0900 |
commit | ffee72d4681c8777918268a96aef42bdeb6c367b (patch) | |
tree | 4baf91483886d561c198ed0524ab54b783273e86 /arch/ia64/Kconfig | |
parent | fb54d268329846aa13b2bc44a64d90e9b7131192 (diff) | |
parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
download | kernel_goldelico_gta04-ffee72d4681c8777918268a96aef42bdeb6c367b.zip kernel_goldelico_gta04-ffee72d4681c8777918268a96aef42bdeb6c367b.tar.gz kernel_goldelico_gta04-ffee72d4681c8777918268a96aef42bdeb6c367b.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 4d4f418..9676100 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 |