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

diff --combined drivers/char/Kconfig
index f418f45,d6adc26..df5f2b0
--- 1/drivers/char/Kconfig
--- 2/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -175,7 -175,7 +175,7 @@@ config MOXA_INTELLI
  
  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.
  
@@@ -842,7 -842,8 +842,7 @@@ config SONYP
  
  config TANBAC_TB0219
        tristate "TANBAC TB0219 base board support"
 -      depends TANBAC_TB0229
 -
 +      depends TANBAC_TB022X
  
  menu "Ftape, the floppy tape device driver"