Merge tag 'for-linus' of https://github.com/openrisc/linux

[linux-2.6-microblaze.git] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 4e87783..7d0d26b 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -12,7 +12,6 @@ config ALPHA
        select FORCE_PCI if !ALPHA_JENSEN
        select PCI_DOMAINS if PCI
        select PCI_SYSCALL if PCI
-       select HAVE_AOUT
        select HAVE_ASM_MODVERSIONS
        select HAVE_PCSPKR_PLATFORM
        select HAVE_PERF_EVENTS
@@ -35,7 +34,6 @@ config ALPHA
        select OLD_SIGSUSPEND
        select CPU_NO_EFFICIENT_FFS if !ALPHA_EV67
        select MMU_GATHER_NO_RANGE
-       select SET_FS
        select SPARSEMEM_EXTREME if SPARSEMEM
        select ZONE_DMA
        help