Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

546ac8a6 · Linus Torvalds · ce7fa1b3 · ce37e5f9 · 546ac8a6
Commit 546ac8a6 authored Dec 19, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/char/Kconfig drivers/char/Kconfig +1 -1

No files found.
--- 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