[patch 1/5] Kconfig: refine some depend statements.

From: Martin Schwidefsky <redacted>

[patch 1/5] Kconfig: refine some depend statements.

Refine the depend statements of four menus (ftape, fusion,
ieee1394 and I2O) and two config options (DTLK and TELCLOCK).

Signed-off-by: Martin Schwidefsky <redacted>
---

 drivers/char/Kconfig           |    3 +++
 drivers/ieee1394/Kconfig       |    1 +
 drivers/message/fusion/Kconfig |    1 +
 drivers/message/i2o/Kconfig    |    1 +
 4 files changed, 6 insertions(+)

diff -urpN linux-2.6/drivers/char/Kconfig linux-2.6-patched/drivers/char/Kconfig

--- linux-2.6/drivers/char/Kconfig	2006-09-05 16:57:02.000000000 +0200
+++ linux-2.6-patched/drivers/char/Kconfig	2006-09-05 16:57:17.000000000 +0200

@@ -842,6 +842,7 @@ config COBALT_LCD
 
 config DTLK
 	tristate "Double Talk PC internal speech card support"
+	depends on ISA
 	help
 	  This driver is for the DoubleTalk PC, a speech synthesizer
 	  manufactured by RC Systems (<http://www.rcsys.com/>).  It is also

@@ -896,6 +897,7 @@ config TANBAC_TB0219
 	select GPIO_VR41XX
 
 menu "Ftape, the floppy tape device driver"
+	depends on BROKEN_ON_SMP && (ALPHA || X86)
 
 config FTAPE
 	tristate "Ftape (QIC-80/Travan) support"

@@ -1079,6 +1081,7 @@ source "drivers/char/tpm/Kconfig"
 config TELCLOCK
 	tristate "Telecom clock driver for MPBL0010 ATCA SBC"
 	depends on EXPERIMENTAL
+	depends on X86
 	default n
 	help
 	  The telecom clock device is specific to the MPBL0010 ATCA computer and

diff -urpN linux-2.6/drivers/ieee1394/Kconfig linux-2.6-patched/drivers/ieee1394/Kconfig

--- linux-2.6/drivers/ieee1394/Kconfig	2006-09-05 16:57:02.000000000 +0200
+++ linux-2.6-patched/drivers/ieee1394/Kconfig	2006-09-05 16:57:17.000000000 +0200

@@ -1,6 +1,7 @@
 # -*- shell-script -*-
 
 menu "IEEE 1394 (FireWire) support"
+	depends on PCI || BROKEN
 
 config IEEE1394
 	tristate "IEEE 1394 (FireWire) support"

diff -urpN linux-2.6/drivers/message/fusion/Kconfig linux-2.6-patched/drivers/message/fusion/Kconfig

--- linux-2.6/drivers/message/fusion/Kconfig	2006-09-05 16:56:23.000000000 +0200
+++ linux-2.6-patched/drivers/message/fusion/Kconfig	2006-09-05 16:57:17.000000000 +0200

@@ -1,5 +1,6 @@
 
 menu "Fusion MPT device support"
+	depends on PCI
 
 config FUSION
 	bool

diff -urpN linux-2.6/drivers/message/i2o/Kconfig linux-2.6-patched/drivers/message/i2o/Kconfig

--- linux-2.6/drivers/message/i2o/Kconfig	2006-09-05 16:57:03.000000000 +0200
+++ linux-2.6-patched/drivers/message/i2o/Kconfig	2006-09-05 16:57:17.000000000 +0200

@@ -1,5 +1,6 @@
 
 menu "I2O device support"
+	depends on PCI
 
 config I2O
 	tristate "I2O support"

On Tue, Sep 05, 2006 at 06:33:05PM +0200, Martin Schwidefsky wrote:

Yup, only available as an ISA card

 menu "Ftape, the floppy tape device driver"
+	depends on BROKEN_ON_SMP && (ALPHA || X86)

I vaguely remember this being the right answer last time this subject
came up ...

	depends on EXPERIMENTAL && X86
perhaps?  Also the "default n" can go -- n is the default default anyway ;-)

 menu "IEEE 1394 (FireWire) support"
+	depends on PCI || BROKEN

Why the || BROKEN?

 menu "Fusion MPT device support"
+	depends on PCI

Makes sense.  Might want to submit that one to linux-scsi, cc'ing Eric
Moore, since the driver is actively maintained.

 menu "I2O device support"
+	depends on PCI

I suspect we'll never see I2O on anything other than PCI, so makes sense.

On Tue, 2006-09-05 at 10:50 -0600, Matthew Wilcox wrote:

quoted

 menu "IEEE 1394 (FireWire) support"
+     depends on PCI || BROKEN

Why the || BROKEN?

That was the conclusion last time as far as I can remember. The essence
of the statement was that firewire works for PCI, any other use is
broken. We can change that to "PCI" only if that is ok with everbody.

-- 
blue skies,
  Martin.

Martin Schwidefsky
Linux for zSeries Development & Services
IBM Deutschland Entwicklung GmbH

"Reality continues to ruin my life." - Calvin.