diff options
| author | Greg Edwards <edwardsg@sgi.com> | 2005-06-28 11:13:00 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-12 14:13:08 -0700 |
| commit | 60a762b6a6dec17cc4339b60154902fd04c2f9f2 (patch) | |
| tree | d01918a446ad451a1ff5226f04e1747a6e48eb85 /arch | |
| parent | 514604c6d1779c55d3e97dc4e9a71c117c1ccbcd (diff) | |
| download | linux-3.10-60a762b6a6dec17cc4339b60154902fd04c2f9f2.tar.gz linux-3.10-60a762b6a6dec17cc4339b60154902fd04c2f9f2.tar.bz2 linux-3.10-60a762b6a6dec17cc4339b60154902fd04c2f9f2.zip | |
[IA64] remove CONFIG_IA64_SGI_SN_SIM
This patch removes the CONFIG_IA64_SGI_SN_SIM option entirely, allowing
any kernel bootable on sn2 to also be booted in the simulator.
Boot tested on Altix and HP rx2600.
Signed-off-by: Greg Edwards <edwardsg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/Kconfig | 7 | ||||
| -rw-r--r-- | arch/ia64/configs/sn2_defconfig | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 01b78e7f992..bfdd062dd82 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -220,13 +220,6 @@ config IOSAPIC depends on !IA64_HP_SIM default y -config IA64_SGI_SN_SIM - bool "SGI Medusa Simulator Support" - 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. - config IA64_SGI_SN_XP tristate "Support communication between SGI SSIs" select IA64_UNCACHED_ALLOCATOR diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index c0561398030..04d0b00a2b8 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig @@ -81,7 +81,6 @@ CONFIG_HOLES_IN_ZONE=y CONFIG_ARCH_DISCONTIGMEM_ENABLE=y # CONFIG_IA64_CYCLONE is not set CONFIG_IOSAPIC=y -CONFIG_IA64_SGI_SN_SIM=y CONFIG_FORCE_MAX_ZONEORDER=18 CONFIG_SMP=y CONFIG_NR_CPUS=512 |