diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /drivers/sn/Kconfig | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
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 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | menu "SN Devices" | 5 | menu "SN Devices" |
| 6 | depends on SGI_SN | ||
| 6 | 7 | ||
| 7 | config SGI_IOC4 | 8 | config SGI_IOC4 |
| 8 | tristate "SGI IOC4 Base IO support" | 9 | tristate "SGI IOC4 Base IO support" |
| 9 | depends on (IA64_GENERIC || IA64_SGI_SN2) && MMTIMER | 10 | depends on MMTIMER |
| 10 | default m | 11 | default m |
| 11 | ---help--- | 12 | ---help--- |
| 12 | This option enables basic support for the SGI IOC4-based Base IO | 13 | This option enables basic support for the SGI IOC4-based Base IO |
| @@ -19,7 +20,6 @@ config SGI_IOC4 | |||
| 19 | 20 | ||
| 20 | config SGI_IOC3 | 21 | config SGI_IOC3 |
| 21 | tristate "SGI IOC3 Base IO support" | 22 | tristate "SGI IOC3 Base IO support" |
| 22 | depends on (IA64_GENERIC || IA64_SGI_SN2) | ||
| 23 | default m | 23 | default m |
| 24 | ---help--- | 24 | ---help--- |
| 25 | This option enables basic support for the SGI IOC3-based Base IO | 25 | This option enables basic support for the SGI IOC3-based Base IO |