diff options
| author |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 12:22:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 12:22:12 -0700 |
| commit | fb7a0e36532bc231bea8adfb1dddc3961eb38940 (patch) | |
| tree | 82cb74383809668d6d92a5124fc60d11b35c8d6e /arch/ia64/Kconfig | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff) | |
| parent | Auto merge with /home/aegl/GIT/linus (diff) | |
| download | linux-dev-fb7a0e36532bc231bea8adfb1dddc3961eb38940.tar.xz linux-dev-fb7a0e36532bc231bea8adfb1dddc3961eb38940.zip | |
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 config IA64_SGI_SN_SIM bool "SGI Medusa Simulator Support" - depends on IA64_SGI_SN2 + depends on IA64_SGI_SN2 || IA64_GENERIC help If you are compiling a kernel that will run under SGI's IA-64 simulator (Medusa) then say Y, otherwise say N. |