diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-19 16:43:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-19 16:43:57 -0800 |
| commit | 546ac8a63186a06e5d21778eefa4695232aee5b8 (patch) | |
| tree | 9af42a244753596cd30ac90473fe9f76ee7e9b7e | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [SPARC]: Fix RTC build failure. (diff) | |
| download | linux-dev-546ac8a63186a06e5d21778eefa4695232aee5b8.tar.xz linux-dev-546ac8a63186a06e5d21778eefa4695232aee5b8.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -rw-r--r-- | drivers/char/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index b46a72d782d6..696f72787fe8 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 && (!(SPARC32 || SPARC64) || 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 |