summaryrefslogtreecommitdiffstats
path: root/drivers/char/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-06 00:29:52 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-06 00:29:52 -0700
commit7bdb2b6aca356c765bb697a4e9e7599357ee1542 (patch)
tree63557166f8f85ba7751b5c9ebf83930ac943bafe /drivers/char/Kconfig
parent4c2cac8908ded8436191bd058e52d2737fd7fd31 (diff)
parentc0f2f761e1ea3923952e31cce2cdb7d65f450fbd (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/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index df5f2b0e075..a1de06d76de 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -175,7 +175,7 @@ config MOXA_INTELLIO
config MOXA_SMARTIO
tristate "Moxa SmartIO support"
- depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32)
+ depends on SERIAL_NONSTANDARD
help
Say Y here if you have a Moxa SmartIO multiport serial card.
@@ -735,7 +735,7 @@ config SGI_IP27_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
- depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32
+ depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32 && !SPARC64
---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