Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6] / include / asm-ia64 / sn / sn_feature_sets.h

diff --git a/include/asm-ia64/sn/sn_feature_sets.h b/include/asm-ia64/sn/sn_feature_sets.h
index ff33e3b..bfdc362 100644 (file)
--- a/include/asm-ia64/sn/sn_feature_sets.h
+++ b/include/asm-ia64/sn/sn_feature_sets.h
@@ -30,8 +30,7 @@ extern int sn_prom_feature_available(int id);
 
 #define PRF_PAL_CACHE_FLUSH_SAFE       0
 #define PRF_DEVICE_FLUSH_LIST          1
-
-
+#define PRF_HOTPLUG_SUPPORT            2
 
 /* --------------------- OS Features -------------------------------*/
 
@@ -45,8 +44,14 @@ extern int sn_prom_feature_available(int id);
  * Once enabled, a feature cannot be disabled.
  *
  * By default, features are disabled unless explicitly enabled.
+ *
+ * These defines must be kept in sync with the corresponding
+ * PROM definitions in feature_sets.h.
  */
 #define  OSF_MCA_SLV_TO_OS_INIT_SLV    0
 #define  OSF_FEAT_LOG_SBES             1
+#define  OSF_ACPI_ENABLE               2
+#define  OSF_PCISEGMENT_ENABLE         3
+
 
 #endif /* _ASM_IA64_SN_FEATURE_SETS_H */