From: Tony Luck <tony.luck@intel.com>
Date: Sun, 11 Sep 2005 21:34:23 +0000 (-0700)
Subject: Pull sn-features into release branch
X-Git-Tag: v2.6.14-rc1~111^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d67eb16f5d444fb6d173bcec889ddb2066c0fa0c;p=linux-2.6

Pull sn-features into release branch
---

d67eb16f5d444fb6d173bcec889ddb2066c0fa0c
diff --cc include/asm-ia64/sn/sn_sal.h
index e67825ad19,231d0d04c3..fea35b33d4
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@@ -77,9 -78,11 +77,12 @@@
  
  #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
   */