Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 5b7dcd5a0e75b663e709b093bc2f4f21fb3d49b8..729cdbdf8036203d99c1b59728aedf37d7a5349f 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -5,6 +5,7 @@
 config ALPHA
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
        help
          The Alpha is a 64-bit general-purpose processor designed and
@@ -329,6 +330,9 @@ config PCI_DOMAINS
 config PCI_SYSCALL
        def_bool PCI
 
+config IOMMU_HELPER
+       def_bool PCI
+
 config ALPHA_CORE_AGP
        bool
        depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL