diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 10:11:50 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-23 10:11:50 -0800 |
commit | 8f43d8e1147406901b7d972d1b528d94def23b0e (patch) | |
tree | 8e0667ce322b79c6a9aade51dc9739f3dc9430fe /drivers/char/Kconfig | |
parent | 7b3dad3d854654e470a598d361919ebdb858f37b (diff) | |
parent | 597d1f0622d21ffe54aceef8da9682e776f51cc2 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/char/Kconfig')
-rw-r--r-- | drivers/char/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 696f72787fe..84e68cdd451 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -687,7 +687,7 @@ config NVRAM config RTC tristate "Enhanced Real Time Clock Support" - depends on !PPC32 && !PARISC && !IA64 && !M68K && (!(SPARC32 || SPARC64) || PCI) + depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC || 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 @@ -735,7 +735,7 @@ config SGI_IP27_RTC config GEN_RTC tristate "Generic /dev/rtc emulation" - depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC32 && !SPARC64 + depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC ---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 |