Merge with ../linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index fc391d97d2c482afc796d3cafed74be06ac46201..c1bf5f6022ec6065ca659fd52281282a52383bf7 100644 (file)
--- 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
+       depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32)
        help
          Say Y here if you have a Moxa SmartIO multiport serial card.
 
@@ -847,8 +847,7 @@ config SONYPI
 
 config TANBAC_TB0219
        tristate "TANBAC TB0219 base board support"
-       depends TANBAC_TB0229
-
+       depends TANBAC_TB022X
 
 menu "Ftape, the floppy tape device driver"