diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 15:22:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 15:22:12 -0400 |
| commit | fb7a0e36532bc231bea8adfb1dddc3961eb38940 (patch) | |
| tree | 82cb74383809668d6d92a5124fc60d11b35c8d6e /arch/ia64/Kconfig | |
| parent | 4e93d3e8859c834ee18dfd33051d24df8669d0c0 (diff) | |
| parent | 29516d75a0b09e0a0328dd55c98a342515c9615a (diff) | |
Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Do arch/ia64/defconfig by hand.
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 34e603cc1716..ce4dfa8b834d 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -220,7 +220,7 @@ config IOSAPIC | |||
| 220 | 220 | ||
| 221 | config IA64_SGI_SN_SIM | 221 | config IA64_SGI_SN_SIM |
| 222 | bool "SGI Medusa Simulator Support" | 222 | bool "SGI Medusa Simulator Support" |
| 223 | depends on IA64_SGI_SN2 | 223 | depends on IA64_SGI_SN2 || IA64_GENERIC |
| 224 | help | 224 | help |
| 225 | If you are compiling a kernel that will run under SGI's IA-64 | 225 | If you are compiling a kernel that will run under SGI's IA-64 |
| 226 | simulator (Medusa) then say Y, otherwise say N. | 226 | simulator (Medusa) then say Y, otherwise say N. |