Pull sn-features into release branch
Tony Luck [Sun, 11 Sep 2005 21:34:23 +0000 (14:34 -0700)]
1  2 
arch/ia64/sn/kernel/setup.c
include/asm-ia64/sn/sn_sal.h

Simple merge
  
  #define SN_SAL_HUB_ERROR_INTERRUPT               0x02000060
  #define SN_SAL_BTE_RECOVER                       0x02000061
 -#define SN_SAL_IOIF_GET_PCI_TOPOLOGY             0x02000062
 +#define SN_SAL_RESERVED_DO_NOT_USE               0x02000062
 +#define SN_SAL_IOIF_GET_PCI_TOPOLOGY             0x02000064
  
+ #define  SN_SAL_GET_PROM_FEATURE_SET             0x02000065
+ #define  SN_SAL_SET_OS_FEATURE_SET               0x02000066
  /*
   * Service-specific constants
   */