--- vrfc
+++ v4
@@ -7,10 +7,10 @@
  1 file changed, 8 deletions(-)
 
 diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h
-index 7604673787d6..df9e4aae917e 100644
+index 97a3bd9ffeb9..9b702d2b80fb 100644
 --- a/arch/powerpc/include/asm/firmware.h
 +++ b/arch/powerpc/include/asm/firmware.h
-@@ -79,8 +79,6 @@ enum {
+@@ -80,8 +80,6 @@ enum {
  	FW_FEATURE_POWERNV_ALWAYS = 0,
  	FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
  	FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
@@ -19,7 +19,7 @@
  	FW_FEATURE_POSSIBLE =
  #ifdef CONFIG_PPC_PSERIES
  		FW_FEATURE_PSERIES_POSSIBLE |
-@@ -90,9 +88,6 @@ enum {
+@@ -91,9 +89,6 @@ enum {
  #endif
  #ifdef CONFIG_PPC_PS3
  		FW_FEATURE_PS3_POSSIBLE |
@@ -29,7 +29,7 @@
  #endif
  		0,
  	FW_FEATURE_ALWAYS =
-@@ -104,9 +99,6 @@ enum {
+@@ -105,9 +100,6 @@ enum {
  #endif
  #ifdef CONFIG_PPC_PS3
  		FW_FEATURE_PS3_ALWAYS &