From 2717b7534eced7a2ede6274977e3d417e048bfd0 Mon Sep 17 00:00:00 2001
From: Ben Gamari <bgamari.foss@gmail.com>
Date: Sun, 7 Jul 2013 17:48:25 -0400
Subject: [PATCH] firmware/: Update #includes for libopencm3 merge

---
 firmware/startup_systick/startup_systick.c       | 4 ++--
 firmware/startup_systick_perfo/perf_mips.c       | 4 ++--
 firmware/startup_systick_perfo/startup_systick.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/firmware/startup_systick/startup_systick.c b/firmware/startup_systick/startup_systick.c
index e650ac81..5a38d2e6 100644
--- a/firmware/startup_systick/startup_systick.c
+++ b/firmware/startup_systick/startup_systick.c
@@ -22,8 +22,8 @@
 #include <libopencm3/lpc43xx/gpio.h>
 #include <libopencm3/lpc43xx/scu.h>
 #include <libopencm3/lpc43xx/i2c.h>
-#include <libopencm3/lpc43xx/nvic.h>
-#include <libopencm3/lpc43xx/systick.h>
+#include <libopencm3/lpc43xx/m4/nvic.h>
+#include <libopencm3/cm3/systick.h>
 #include <libopencm3/cm3/scs.h>
 
 #include "hackrf_core.h"
diff --git a/firmware/startup_systick_perfo/perf_mips.c b/firmware/startup_systick_perfo/perf_mips.c
index b5cc8345..a798b6ff 100644
--- a/firmware/startup_systick_perfo/perf_mips.c
+++ b/firmware/startup_systick_perfo/perf_mips.c
@@ -22,8 +22,8 @@
 #include <libopencm3/lpc43xx/gpio.h>
 #include <libopencm3/lpc43xx/scu.h>
 #include <libopencm3/lpc43xx/i2c.h>
-#include <libopencm3/lpc43xx/nvic.h>
-#include <libopencm3/lpc43xx/systick.h>
+#include <libopencm3/lpc43xx/m4/nvic.h>
+#include <libopencm3/cm3/systick.h>
 #include <libopencm3/cm3/scs.h>
 
 #include "hackrf_core.h"
diff --git a/firmware/startup_systick_perfo/startup_systick.c b/firmware/startup_systick_perfo/startup_systick.c
index 28c45199..3aea48fd 100644
--- a/firmware/startup_systick_perfo/startup_systick.c
+++ b/firmware/startup_systick_perfo/startup_systick.c
@@ -22,8 +22,8 @@
 #include <libopencm3/lpc43xx/gpio.h>
 #include <libopencm3/lpc43xx/scu.h>
 #include <libopencm3/lpc43xx/i2c.h>
-#include <libopencm3/lpc43xx/nvic.h>
-#include <libopencm3/lpc43xx/systick.h>
+#include <libopencm3/lpc43xx/m4/nvic.h>
+#include <libopencm3/cm3/systick.h>
 #include <libopencm3/cm3/scs.h>
 
 #include "hackrf_core.h"