summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/import/chips/p9/sw_simulation/powermgmt.act2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/import/chips/p9/sw_simulation/powermgmt.act b/src/import/chips/p9/sw_simulation/powermgmt.act
index 66560f9a..3542457e 100644
--- a/src/import/chips/p9/sw_simulation/powermgmt.act
+++ b/src/import/chips/p9/sw_simulation/powermgmt.act
@@ -3506,6 +3506,7 @@ CAUSE_EFFECT {
WATCH=[REG(0x01010805]
EFFECT: TARGET=[REG(0x01010803)] OP=[EQUALTO,BUF] DATA=[REG(0x01010805)]
}
+
##
## Actions for Procedure - p9_sbe_check_master_stop15 and others
##
@@ -6209,5 +6210,4 @@ CAUSE_EFFECT {
}
## Core 23 End
->>>>>>> Level 2 p9_cpu_special_wakeup
OpenPOWER on IntegriCloud