X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=arch%2Falpha%2FKconfig;h=6110197757a3f6283bf999519f1e7649fb96a867;hb=dc52ddc0e6f45b04780b26fc0813509f8e798c42;hp=5b7dcd5a0e75b663e709b093bc2f4f21fb3d49b8;hpb=bdc807871d58285737d50dc6163d0feb72cb0dc2;p=safe%2Fjmp%2Flinux-2.6

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 5b7dcd5..6110197 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -5,6 +5,8 @@
 config ALPHA
 	bool
 	default y
+	select HAVE_AOUT
+	select HAVE_IDE
 	select HAVE_OPROFILE
 	help
 	  The Alpha is a 64-bit general-purpose processor designed and
@@ -67,10 +69,8 @@ config AUTO_IRQ_AFFINITY
 	depends on SMP
 	default y
 
-config ARCH_SUPPORTS_AOUT
-	def_bool y
-
 source "init/Kconfig"
+source "kernel/Kconfig.freezer"
 
 
 menu "System setup"
@@ -223,8 +223,7 @@ config ALPHA_MIATA
 	bool "Miata"
 	help
 	  The Digital PersonalWorkStation (PWS 433a, 433au, 500a, 500au, 600a,
-	  or 600au).  There is an Installation HOWTO for this hardware at
-	  <http://eijk.homelinux.org/~stefan/miata.html>.
+	  or 600au).
 
 config ALPHA_MIKASA
 	bool "Mikasa"
@@ -329,10 +328,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 +521,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