1 files changed, 24 insertions, 0 deletions

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 36b4b7ab9cfb..035b15af90d8 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -18,6 +18,13 @@ config SPARC64
         select HAVE_ARCH_KGDB
         select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_ARCH_TRACEHOOK
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select RTC_CLASS
+        select RTC_DRV_M48T59
+        select RTC_DRV_CMOS
+        select RTC_DRV_BQ4802
+        select RTC_DRV_SUN4V
+        select RTC_DRV_STARFIRE
 
 config GENERIC_TIME
         bool
@@ -31,6 +38,11 @@ config GENERIC_CLOCKEVENTS
         bool
         default y
 
+config GENERIC_GPIO
+        bool
+        help
+          Generic GPIO API support
+
 config 64BIT
         def_bool y
 
@@ -84,6 +96,7 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
         def_bool y
 
 source "init/Kconfig"
+source "kernel/Kconfig.freezer"
 
 menu "Processor type and features"
 
@@ -185,6 +198,17 @@ config US2E_FREQ
 
           If in doubt, say N.
 
+config US3_MC
+        tristate "UltraSPARC-III Memory Controller driver"
+        default y
+        help
+          This adds a driver for the UltraSPARC-III memory controller.
+          Loading this driver allows exact mnemonic strings to be
+          printed in the event of a memory error, so that the faulty DIMM
+          on the motherboard can be matched to the error.
+
+          If in doubt, say Y, as this information can be very useful.
+
 # Global things across all Sun machines.
 config GENERIC_LOCKBREAK
         bool