Pull sgi-drivers-makefile-cleanup into release branch

diff --combined arch/ia64/Kconfig
index a1942f79638bef5c250b67934b6e44453d2da9a7,8e5517e62c0ac56fed2cd4a71a40ddbcd6b65551..845cd0902a5008e91e696109154f53d0ecab8cd2
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -194,6 -194,7 +194,6 @@@ config IA64_L1_CACHE_SHIF
        default "7" if MCKINLEY
        default "6" if ITANIUM
  
 -# align cache-sensitive data to 64 bytes
  config IA64_CYCLONE
        bool "Cyclone (EXA) Time Source support"
        help
@@@ -373,6 -374,9 +373,9 @@@ config IA64_PALINF
          To use this option, you have to ensure that the "/proc file system
          support" (CONFIG_PROC_FS) is enabled, too.
  
+ config SGI_SN
+       def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
+ 
  source "drivers/firmware/Kconfig"
  
  source "fs/Kconfig.binfmt"