Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok
  [SPARC32]: Fix bug in sparc optimized memset.
  [SPARC64]: Update defconfig.
  [SPARC]: Add missing NOTES section.
  [SPARC32]: missing exports
  [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.

3 files changed, 27 insertions, 1 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c8dfd18bea44..acdbcdc3e457 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -726,7 +726,7 @@ config NVRAM
 
 config RTC
         tristate "Enhanced Real Time Clock Support"
-        depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC64 && (!SPARC32 || PCI) && !FRV && !ARM && !SUPERH && !S390
+        depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV && !ARM && !SUPERH && !S390
         ---help---
           If you say Y here and create a character special file /dev/rtc with
           major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -750,6 +750,28 @@ config RTC
           To compile this driver as a module, choose M here: the
           module will be called rtc.
 
+config JS_RTC
+        tristate "Enhanced Real Time Clock Support"
+        depends on SPARC32 && PCI
+        ---help---
+          If you say Y here and create a character special file /dev/rtc with
+          major number 10 and minor number 135 using mknod ("man mknod"), you
+          will get access to the real time clock (or hardware clock) built
+          into your computer.
+
+          Every PC has such a clock built in. It can be used to generate
+          signals from as low as 1Hz up to 8192Hz, and can also be used
+          as a 24 hour alarm. It reports status information via the file
+          /proc/driver/rtc and its behaviour is set by various ioctls on
+          /dev/rtc.
+
+          If you think you have a use for such a device (such as periodic data
+          sampling), then say Y here, and read <file:Documentation/rtc.txt>
+          for details.
+
+          To compile this driver as a module, choose M here: the
+          module will be called js-rtc.
+
 config SGI_DS1286
         tristate "SGI DS1286 RTC support"
         depends on SGI_IP22
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 8fecaf4010b1..23b26b87cc32 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -109,6 +109,9 @@ obj-$(CONFIG_TCG_TPM)		+= tpm/
 
 obj-$(CONFIG_PS3_FLASH)         += ps3flash.o
 
+obj-$(CONFIG_JS_RTC)            += js-rtc.o
+js-rtc-y = rtc.o
+
 # Files generated that shall be removed upon make clean
 clean-files := consolemap_deftbl.c defkeymap.c
 
diff --git a/drivers/sbus/char/Kconfig b/drivers/sbus/char/Kconfig
index 35a73168333f..400c65bfb8c7 100644
--- a/drivers/sbus/char/Kconfig
+++ b/drivers/sbus/char/Kconfig
@@ -15,6 +15,7 @@ config SUN_OPENPROMIO
 
 config SUN_MOSTEK_RTC
         tristate "Mostek real time clock support"
+        depends on SPARC32
         help
           The Mostek RTC chip is used on all known Sun computers except
           some JavaStations. For a JavaStation you need to say Y both here