summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 19:52:45 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 19:52:45 -0700
commit897f5ab2cd733a77a2279268262919caa8154b9d (patch)
tree95866d31faa6db4ec786399296238344c7cfea0c /drivers
parent1d42a0ecf478962e8aede355a0be41365c117ff0 (diff)
parentb48fc7bb3868abffc89ce70d4baf324574338d8e (diff)
downloadop-kernel-dev-897f5ab2cd733a77a2279268262919caa8154b9d.zip
op-kernel-dev-897f5ab2cd733a77a2279268262919caa8154b9d.tar.gz
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 2d5a19f..5ed6515 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -408,7 +408,7 @@ config SGI_TIOCX
config SGI_MBCS
tristate "SGI FPGA Core Services driver support"
- depends on (IA64_SGI_SN2 || IA64_GENERIC)
+ depends on SGI_TIOCX
help
If you have an SGI Altix with an attached SABrick
say Y or M here, otherwise say N.
OpenPOWER on IntegriCloud