Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 5b7dcd5a0e75b663e709b093bc2f4f21fb3d49b8..1bec55d63ef6241fb9451c821a09960657503acb 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,10 +330,8 @@ config PCI_DOMAINS
 config PCI_SYSCALL
        def_bool PCI
 
-config ALPHA_CORE_AGP
-       bool
-       depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL
-       default y
+config IOMMU_HELPER
+       def_bool PCI
 
 config ALPHA_NONAME
        bool
@@ -524,6 +523,7 @@ config ARCH_MAY_HAVE_PC_FDC
 config SMP
        bool "Symmetric multi-processing support"
        depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL
+       select USE_GENERIC_SMP_HELPERS
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If