X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Favr32_ap7k.h;h=65b856ef133781f6e86c4fe02f15072094f74ce3;hb=d74f11dcd43914702ea7b011c4bbb7da8d4a2f5c;hp=d08254b14d2e0ac554fcac8361b46196904f3b1f;hpb=c3d51bf0da7333de303adf86011913a4bca96e4d;p=openocd.git

diff --git a/src/target/avr32_ap7k.h b/src/target/avr32_ap7k.h
index d08254b14d..65b856ef13 100644
--- a/src/target/avr32_ap7k.h
+++ b/src/target/avr32_ap7k.h
@@ -12,21 +12,16 @@
  *   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 AVR32_AP7K
-#define AVR32_AP7K
-
-#include <helper/types.h>
+#ifndef OPENOCD_TARGET_AVR32_AP7K_H
+#define OPENOCD_TARGET_AVR32_AP7K_H
 
 struct target;
 
-#define AP7k_COMMON_MAGIC	0x4150374b
-struct avr32_ap7k_common
-{
+#define AP7K_COMMON_MAGIC	0x4150374b
+struct avr32_ap7k_common {
 	int common_magic;
 	struct avr32_jtag jtag;
 	struct reg_cache *core_cache;
@@ -36,14 +31,13 @@ struct avr32_ap7k_common
 static inline struct avr32_ap7k_common *
 target_to_ap7k(struct target *target)
 {
-	return (struct avr32_ap7k_common*)target->arch_info;
+	return (struct avr32_ap7k_common *)target->arch_info;
 }
 
-struct avr32_core_reg
-{
+struct avr32_core_reg {
 	uint32_t num;
 	struct target *target;
 	struct avr32_ap7k_common *avr32_common;
 };
 
-#endif	/*AVR32_AP7K*/
+#endif /* OPENOCD_TARGET_AVR32_AP7K_H */