diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2007-07-22 09:37:48 +0200 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-24 22:24:32 +0200 |
commit | 2240598c24683df1e1a6cdd1f461efd85547903c (patch) | |
tree | 9e7d27a68d0bc3a88c7e1e86f2111c6b0fb9fce8 /drivers/char/Kconfig | |
parent | slab: correctly handle __GFP_ZERO (diff) | |
download | linux-2240598c24683df1e1a6cdd1f461efd85547903c.tar.xz linux-2240598c24683df1e1a6cdd1f461efd85547903c.zip |
[SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/char/Kconfig')
-rw-r--r-- | drivers/char/Kconfig | 24 |
1 files changed, 23 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 |