diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-19 19:43:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-19 19:43:57 -0500 |
| commit | 546ac8a63186a06e5d21778eefa4695232aee5b8 (patch) | |
| tree | 9af42a244753596cd30ac90473fe9f76ee7e9b7e | |
| parent | ce7fa1b3f9105873f6e26edb7241c848cab70e4d (diff) | |
| parent | ce37e5f90366cb90320a285edd2113fd807f3ab6 (diff) | |
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 | |||
| 687 | 687 | ||
| 688 | config RTC | 688 | config RTC |
| 689 | tristate "Enhanced Real Time Clock Support" | 689 | tristate "Enhanced Real Time Clock Support" |
| 690 | depends on !PPC32 && !PARISC && !IA64 && !M68K | 690 | depends on !PPC32 && !PARISC && !IA64 && !M68K && (!(SPARC32 || SPARC64) || PCI) |
| 691 | ---help--- | 691 | ---help--- |
| 692 | If you say Y here and create a character special file /dev/rtc with | 692 | If you say Y here and create a character special file /dev/rtc with |
| 693 | major number 10 and minor number 135 using mknod ("man mknod"), you | 693 | major number 10 and minor number 135 using mknod ("man mknod"), you |