From: Linus Torvalds <torvalds@evo.osdl.org>
Date: Mon, 5 Sep 2005 07:12:58 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.14-rc1~776
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e766f1cc596078b1603ac2c96617660c4c7e2d81;hp=-c

Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
---

e766f1cc596078b1603ac2c96617660c4c7e2d81
diff --combined drivers/char/Kconfig
index f418f45e0780,d6adc2614f69..df5f2b0e0750
--- a/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"