projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c85b2a5 a1cddb8)
Pull sn-features into release branch
authorTony Luck <tony.luck@intel.com>
Sun, 11 Sep 2005 21:34:23 +0000 (14:34 -0700)
committerTony Luck <tony.luck@intel.com>
Sun, 11 Sep 2005 21:34:23 +0000 (14:34 -0700)
1  2 
arch/ia64/sn/kernel/setup.c patch | diff1 | diff2 | blob | history
include/asm-ia64/sn/sn_sal.h patch | diff1 | diff2 | blob | history

diff --cc arch/ia64/sn/kernel/setup.c
Simple merge
diff --cc include/asm-ia64/sn/sn_sal.h
index e67825ad1930cee26dca3971b5c674f1e21c79e1,231d0d04c3e8d0424317c83b24ca250557b8b90b..fea35b33d4e485f835cbfd678121f053f4a925f2
--- 1/include/asm-ia64/sn/sn_sal.h
--- 2/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
   */