Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2240598c authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[SPARC32]: Deal with rtc/sun_mostek_rtc conflict. 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8c1c5da

arch/sparc/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_IPMI_HANDLER is not set

# CONFIG_WATCHDOG is not set

CONFIG_HW_RANDOM=m

CONFIG_RTC=m

CONFIG_JS_RTC=m

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_DRM is not set

drivers/char/Kconfig

+23 −1
Original line number Diff line number Diff line
@@ -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

drivers/char/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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

drivers/sbus/char/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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