diff options
author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:12:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:12:58 -0400 |
commit | e766f1cc596078b1603ac2c96617660c4c7e2d81 (patch) | |
tree | 86f24a621dbe39fd25dcec539c2f969f50bfbcab /drivers/char | |
parent | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (diff) | |
parent | ebede60741e2cec6d210f137fd22a30e37abc0be (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/char')
-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 f418f45e0780..df5f2b0e0750 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -175,7 +175,7 @@ config MOXA_INTELLIO | |||
175 | 175 | ||
176 | config MOXA_SMARTIO | 176 | config MOXA_SMARTIO |
177 | tristate "Moxa SmartIO support" | 177 | tristate "Moxa SmartIO support" |
178 | depends on SERIAL_NONSTANDARD | 178 | depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32) |
179 | help | 179 | help |
180 | Say Y here if you have a Moxa SmartIO multiport serial card. | 180 | Say Y here if you have a Moxa SmartIO multiport serial card. |
181 | 181 | ||