diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 22:52:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 22:52:45 -0400 |
| commit | 897f5ab2cd733a77a2279268262919caa8154b9d (patch) | |
| tree | 95866d31faa6db4ec786399296238344c7cfea0c /drivers/char | |
| parent | 1d42a0ecf478962e8aede355a0be41365c117ff0 (diff) | |
| parent | b48fc7bb3868abffc89ce70d4baf324574338d8e (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 2d5a19f6378d..5ed6515ae01f 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -408,7 +408,7 @@ config SGI_TIOCX | |||
| 408 | 408 | ||
| 409 | config SGI_MBCS | 409 | config SGI_MBCS |
| 410 | tristate "SGI FPGA Core Services driver support" | 410 | tristate "SGI FPGA Core Services driver support" |
| 411 | depends on (IA64_SGI_SN2 || IA64_GENERIC) | 411 | depends on SGI_TIOCX |
| 412 | help | 412 | help |
| 413 | If you have an SGI Altix with an attached SABrick | 413 | If you have an SGI Altix with an attached SABrick |
| 414 | say Y or M here, otherwise say N. | 414 | say Y or M here, otherwise say N. |