diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-01 20:45:47 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-01 20:45:47 +0100 |
commit | d2dbaad8555b9a078830ac1aab7ef7a37461c640 (patch) | |
tree | 6d455666df51db6a24834e6551e246e0c0d0d078 /drivers/sn/Kconfig | |
parent | Merge branch 'master' (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
download | linux-d2dbaad8555b9a078830ac1aab7ef7a37461c640.tar.xz linux-d2dbaad8555b9a078830ac1aab7ef7a37461c640.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/sn/Kconfig')
-rw-r--r-- | drivers/sn/Kconfig | 4 |
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 |