summaryrefslogtreecommitdiffstats
path: root/drivers/sn/Kconfig
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-01-18 04:49:59 +0100
committerSteve French <sfrench@us.ibm.com>2006-01-18 04:49:59 +0100
commitd65177c1ae7f085723154105c5dc8d9e16ae8265 (patch)
tree14408129d880d89cc5e937f2810f243ed1e6fcde /drivers/sn/Kconfig
parent[CIFS] Remove compiler warning (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-d65177c1ae7f085723154105c5dc8d9e16ae8265.tar.xz
linux-d65177c1ae7f085723154105c5dc8d9e16ae8265.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/sn/Kconfig')
-rw-r--r--drivers/sn/Kconfig14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig
index 13b8d249da5c..d95265b187a3 100644
--- a/drivers/sn/Kconfig
+++ b/drivers/sn/Kconfig
@@ -17,4 +17,18 @@ config SGI_IOC4
If you have an SGI Altix with an IOC4-based
I/O controller say Y. Otherwise say N.
+config SGI_IOC3
+ tristate "SGI IOC3 Base IO support"
+ depends on (IA64_GENERIC || IA64_SGI_SN2)
+ default m
+ ---help---
+ This option enables basic support for the SGI IOC3-based Base IO
+ controller card. This option does not enable any specific
+ functions on such a card, but provides necessary infrastructure
+ for other drivers to utilize.
+
+ If you have an SGI Altix with an IOC3-based
+ I/O controller or a PCI IOC3 serial card say Y.
+ Otherwise say N.
+
endmenu