X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fetm.h;h=5aea65714134648d860e0f15daac1d012dfa90ae;hb=910dd664ceb6faef5e9029e9b0848d7ccc63bf4b;hp=c8da794768be7460badefcd155efe5d9a6769462;hpb=f74e2e033a2ad082e5bef67d0ddedd1db3f58300;p=openocd.git

diff --git a/src/target/etm.h b/src/target/etm.h
index c8da794768..5aea657141 100644
--- a/src/target/etm.h
+++ b/src/target/etm.h
@@ -23,8 +23,8 @@
 #ifndef ETM_H
 #define ETM_H
 
-#include "trace.h"
-#include "arm_jtag.h"
+#include <target/trace.h>
+#include <target/arm_jtag.h>
 
 struct image;
 
@@ -164,7 +164,7 @@ struct etm_context
 	uint32_t trace_depth;		/* number of cycles to be analyzed, 0 if no data available */
 	etm_portmode_t portmode;	/* normal, multiplexed or demultiplexed */
 	etmv1_tracemode_t tracemode;	/* type of info trace contains */
-	int /*armv4_5_state_t*/ core_state;	/* current core state */
+	int /*arm_state*/ core_state;	/* current core state */
 	struct image *image;		/* source for target opcodes */
 	uint32_t pipe_index;		/* current trace cycle */
 	uint32_t data_index;		/* cycle holding next data packet */