summaryrefslogtreecommitdiffstats
path: root/src/usr/pnor
diff options
context:
space:
mode:
authorDan Crowell <dcrowell@us.ibm.com>2014-05-21 08:32:24 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2014-06-23 15:27:47 -0500
commit8db75be06e46c934fbaf437ccb90d2e3831b5699 (patch)
treebafd2c298eacc5ccefd96ddee6f015aa0e0ce54d /src/usr/pnor
parent02c81ca3e1e06b910c58905bcab913d30b0a5337 (diff)
downloadtalos-hostboot-8db75be06e46c934fbaf437ccb90d2e3831b5699.tar.gz
talos-hostboot-8db75be06e46c934fbaf437ccb90d2e3831b5699.zip
Remove some traces from targeting that are not useful
Change-Id: I0d56d9ecbf9d981bda9e2c8ed42031d52aa2e4f1 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11206 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/pnor')
-rw-r--r--src/usr/pnor/pnordd.H1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/usr/pnor/pnordd.H b/src/usr/pnor/pnordd.H
index 8752768ed..25c670440 100644
--- a/src/usr/pnor/pnordd.H
+++ b/src/usr/pnor/pnordd.H
@@ -298,7 +298,6 @@ class PnorDD
/**
-<<<<<<< HEAD
* @brief LPC Slave Registers
* These are offsets within the LPC Slave Register Space
*/
OpenPOWER on IntegriCloud