diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
| commit | 9a21247181d93fdf99255911845ecdb041d21583 (patch) | |
| tree | 6d69be36f8a2bd8c76bf02ead2f0121a511c0a92 /drivers/sn/Kconfig | |
| parent | c752666c17f870fa8ae9f16804dd457e9e6daaec (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
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 @@ | |||
| 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 |