diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:49:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:49:18 -0500 |
| commit | ac67c6247361b3b8644b34e5301a46d5069c1373 (patch) | |
| tree | dd83147e304181e889eefa39e5056451031f4b5d /drivers/char/Kconfig | |
| parent | c4c48d83e9ffb1c25cccd59d5ea9dda6ded01faf (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
Merge branch 'master'
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 b46a72d782d..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 + 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 |