X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm966e.h;h=aa2e9bb2700ba517de8ecc217a30e644a66424bb;hp=6c169700e56950d5cff52de9941699286f2624bf;hb=010b09121ca08f955921654c6a3d405be80afef1;hpb=2c35b35e111b5a23a3316e02e419c212840c4cc2

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index 6c169700e5..aa2e9bb270 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -16,19 +16,17 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef ARM966E_H
-#define ARM966E_H
 
-#include <target/arm9tdmi.h>
+#ifndef OPENOCD_TARGET_ARM966E_H
+#define OPENOCD_TARGET_ARM966E_H
+
+#include "arm9tdmi.h"
 
 #define	ARM966E_COMMON_MAGIC 0x20f920f9
 
-struct arm966e_common
-{
+struct arm966e_common {
 	struct arm7_9_common arm7_9_common;
 	int common_magic;
 	uint32_t cp15_control_reg;
@@ -38,7 +36,7 @@ static inline struct arm966e_common *
 target_to_arm966(struct target *target)
 {
 	return container_of(target->arch_info, struct arm966e_common,
-			arm7_9_common.armv4_5_common);
+			arm7_9_common.arm);
 }
 
 int arm966e_init_arch_info(struct target *target,
@@ -47,4 +45,4 @@ int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value);
 
 extern const struct command_registration arm966e_command_handlers[];
 
-#endif /* ARM966E_H */
+#endif /* OPENOCD_TARGET_ARM966E_H */