Merge tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alars...

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

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 02c8fd1..11bf9d3 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -58,6 +58,8 @@ config SPARC32
        select CLZ_TAB
        select DMA_DIRECT_REMAP
        select GENERIC_ATOMIC64
+       select GENERIC_LIB_CMPDI2
+       select GENERIC_LIB_UCMPDI2
        select HAVE_UID16
        select HAVE_PAGE_SIZE_4KB
        select LOCK_MM_AND_FIND_VMA
@@ -115,10 +117,6 @@ config ARCH_PROC_KCORE_TEXT
 config CPU_BIG_ENDIAN
        def_bool y
 
-config ARCH_ATU
-       bool
-       default y if SPARC64
-
 config STACKTRACE_SUPPORT
        bool
        default y if SPARC64
@@ -143,10 +141,6 @@ config HIGHMEM
        default y if SPARC32
        select KMAP_LOCAL
 
-config GENERIC_ISA_DMA
-       bool
-       default y if SPARC32
-
 config PGTABLE_LEVELS
        default 4 if 64BIT
        default 3
@@ -222,6 +216,8 @@ config EARLYFB
        bool "Support for early boot text console"
        default y
        depends on SPARC64
+       select FONT_SUN8x16
+       select FONT_SUPPORT
        help
          Say Y here to enable a faster early framebuffer boot console.