summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJes Sorensen <jes@sgi.com>2006-02-17 16:25:39 +0100
committerTony Luck <tony.luck@intel.com>2006-02-28 00:06:41 +0100
commit50e300dead8dadf32e930ebd80d9810d631aa1a0 (patch)
treeac8df9f2c8495bf6b3c28330fdce4f498c23e774
parentMerge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff)
downloadlinux-50e300dead8dadf32e930ebd80d9810d631aa1a0.tar.xz
linux-50e300dead8dadf32e930ebd80d9810d631aa1a0.zip
[IA64] show "SN Devices" menu only if CONFIG_SGI_SN
Adrian> On architectures like i386, the "Multimedia Capabilities Port Adrian> drivers" menu is visible, but it can't be visited since it Adrian> contains nothing usable for CONFIG_SGI_SN=n. Jes> Thats only a third of the patch, if you want to do that, you should Jes> remove the redundant SGI_SN checks below. Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--drivers/sn/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sn/Kconfig b/drivers/sn/Kconfig
index d95265b187a3..a34731625877 100644
--- a/drivers/sn/Kconfig
+++ b/drivers/sn/Kconfig
@@ -3,10 +3,11 @@
#
menu "SN Devices"
+ depends on SGI_SN
config SGI_IOC4
tristate "SGI IOC4 Base IO support"
- depends on (IA64_GENERIC || IA64_SGI_SN2) && MMTIMER
+ depends on MMTIMER
default m
---help---
This option enables basic support for the SGI IOC4-based Base IO
@@ -19,7 +20,6 @@ config SGI_IOC4
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