Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index b5eb7dd..ad903fc 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -146,20 +146,6 @@ config IA64_L1_CACHE_SHIFT
        default "6" if ITANIUM
 
 # align cache-sensitive data to 64 bytes
-config MCKINLEY_ASTEP_SPECIFIC
-       bool "McKinley A-step specific code"
-       depends on MCKINLEY
-       help
-         Select this option to build a kernel for an IA-64 McKinley prototype
-         system with any A-stepping CPU.
-
-config MCKINLEY_A0_SPECIFIC
-       bool "McKinley A0/A1-step specific code"
-       depends on MCKINLEY_ASTEP_SPECIFIC
-       help
-         Select this option to build a kernel for an IA-64 McKinley prototype
-         system with an A0 or A1 stepping CPU.
-
 config NUMA
        bool "NUMA support"
        depends on !IA64_HP_SIM
@@ -399,7 +385,7 @@ config IA64_GRANULE_16MB
 
 config IA64_GRANULE_64MB
        bool "64MB"
-       depends on !(IA64_GENERIC || IA64_HP_ZX1)
+       depends on !(IA64_GENERIC || IA64_HP_ZX1 || IA64_SGI_SN2)
 
 endchoice