---

yaml --- r: 42296 b: refs/heads/master c: 82a527f h: refs/heads/master v: v3
git-mirror · Dec 4, 2006 · 73998da · 73998da
1 parent 7c824b8
commit 73998da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e4ed915d133aaa2802d11914a7e80b3e31304e6
+refs/heads/master: 82a527f0bd84977d7e85f15fb1f987c42cc0a68d
diff --git a/trunk/include/asm-powerpc/firmware.h b/trunk/include/asm-powerpc/firmware.h
@@ -58,12 +58,17 @@ enum {
 	FW_FEATURE_PSERIES_ALWAYS = 0,
 	FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
 	FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
+	FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR,
+	FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR,
 	FW_FEATURE_POSSIBLE =
 #ifdef CONFIG_PPC_PSERIES
 		FW_FEATURE_PSERIES_POSSIBLE |
 #endif
 #ifdef CONFIG_PPC_ISERIES
 		FW_FEATURE_ISERIES_POSSIBLE |
+#endif
+#ifdef CONFIG_PS3
+		FW_FEATURE_PS3_POSSIBLE |
 #endif
 		0,
 	FW_FEATURE_ALWAYS =
@@ -72,6 +77,9 @@ enum {
 #endif
 #ifdef CONFIG_PPC_ISERIES
 		FW_FEATURE_ISERIES_ALWAYS &
+#endif
+#ifdef CONFIG_PS3
+		FW_FEATURE_PS3_ALWAYS &
 #endif
 		FW_FEATURE_POSSIBLE,