Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index f5041d741deac344471888af3c08b56456d4aeaa..9ac9f1666339015c3220631a4efe43226844b6d3 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -99,6 +99,9 @@ config HAVE_LATENCYTOP_SUPPORT
        bool
        default y if SPARC64
 
+config ARCH_HIBERNATION_POSSIBLE
+       def_bool y if SPARC64
+
 config AUDIT_ARCH
        bool
        default y
@@ -134,11 +137,6 @@ config GENERIC_ISA_DMA
        bool
        default y if SPARC32
 
-config GENERIC_GPIO
-       bool
-       help
-         Generic GPIO API support
-
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
        def_bool y if SPARC64
 
@@ -303,6 +301,10 @@ config ARCH_SPARSEMEM_DEFAULT
 
 source "mm/Kconfig"
 
+if SPARC64
+source "kernel/power/Kconfig"
+endif
+
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
        depends on SPARC64 && SMP
@@ -472,7 +474,18 @@ config LEON_PCI
        depends on PCI && SPARC_LEON
        default y
 
-config GRPCI2
+config SPARC_GRPCI1
+       bool "GRPCI Host Bridge Support"
+       depends on LEON_PCI
+       default y
+       help
+         Say Y here to include the GRPCI Host Bridge Driver. The GRPCI
+         PCI host controller is typically found in GRLIB SPARC32/LEON
+         systems. The driver has one property (all_pci_errors) controlled
+         from the bootloader that makes the GRPCI to generate interrupts
+         on detected PCI Parity and System errors.
+
+config SPARC_GRPCI2
        bool "GRPCI2 Host Bridge Support"
        depends on LEON_PCI
        default y