summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-28 20:56:24 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-28 20:56:24 -0800
commit77eebf346dfe87587ee8a54c76349a996e80c24f (patch)
treed8b7685cbc7dbc993ec39d3028e6f0246924bf40 /drivers
parent2641dfd981e4a3eebf387f21cf10685af06e1641 (diff)
parentd2b176ed878d4d5fcc0bd35656dfd373f3702af9 (diff)
downloadlinux-77eebf346dfe87587ee8a54c76349a996e80c24f.tar.gz
linux-77eebf346dfe87587ee8a54c76349a996e80c24f.tar.bz2
linux-77eebf346dfe87587ee8a54c76349a996e80c24f.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'drivers')
-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