From 9f925ba9d2c4625a086e9fc90be233d7a7b32793 Mon Sep 17 00:00:00 2001
From: Thomas Helms <di.jamezz@gmail.com>
Date: Wed, 11 Apr 2018 13:13:05 -0700
Subject: [PATCH] Fix the merge mess

---
 board/safety/safety_defaults.h | 6 +++---
 board/safety/safety_elm327.h   | 2 +-
 board/safety/safety_gm.h       | 2 +-
 board/safety/safety_honda.h    | 3 ++-
 board/safety/safety_toyota.h   | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/board/safety/safety_defaults.h b/board/safety/safety_defaults.h
index ad504682adcc00..16ab3643f83af2 100644
--- a/board/safety/safety_defaults.h
+++ b/board/safety/safety_defaults.h
@@ -26,7 +26,7 @@ const safety_hooks nooutput_hooks = {
   .rx = default_rx_hook,
   .tx = nooutput_tx_hook,
   .tx_lin = nooutput_tx_lin_hook,
-  .ignition = nooutput_ign_hook
+  .ignition = nooutput_ign_hook,
   .fwd = nooutput_fwd_hook,
 };
 
@@ -45,7 +45,7 @@ static int alloutput_tx_lin_hook(int lin_num, uint8_t *data, int len) {
 }
 
 static int alloutput_ign_hook() {
-  return -1
+  return -1;
 }
 
 static int alloutput_fwd_hook(int bus_num, CAN_FIFOMailBox_TypeDef *to_fwd) {
@@ -57,7 +57,7 @@ const safety_hooks alloutput_hooks = {
   .rx = default_rx_hook,
   .tx = alloutput_tx_hook,
   .tx_lin = alloutput_tx_lin_hook,
-  .ignition = alloutput_ign_hook
+  .ignition = alloutput_ign_hook,
   .fwd = alloutput_fwd_hook,
 };
 
diff --git a/board/safety/safety_elm327.h b/board/safety/safety_elm327.h
index 043264f57607fe..0b23fa5dac18e2 100644
--- a/board/safety/safety_elm327.h
+++ b/board/safety/safety_elm327.h
@@ -44,6 +44,6 @@ const safety_hooks elm327_hooks = {
   .rx = elm327_rx_hook,
   .tx = elm327_tx_hook,
   .tx_lin = elm327_tx_lin_hook,
-  .ignition = elm327_ign_hook
+  .ignition = elm327_ign_hook,
   .fwd = elm327_fwd_hook,
 };
diff --git a/board/safety/safety_gm.h b/board/safety/safety_gm.h
index 771b6f860c1ee8..40fc14d54c8536 100644
--- a/board/safety/safety_gm.h
+++ b/board/safety/safety_gm.h
@@ -193,7 +193,7 @@ const safety_hooks gm_hooks = {
   .rx = gm_rx_hook,
   .tx = gm_tx_hook,
   .tx_lin = gm_tx_lin_hook,
-  .ignition = gm_ign_hook
+  .ignition = gm_ign_hook,
   .fwd = gm_fwd_hook,
 };
 
diff --git a/board/safety/safety_honda.h b/board/safety/safety_honda.h
index 798f3934204fa9..bc6ce6e9c08030 100644
--- a/board/safety/safety_honda.h
+++ b/board/safety/safety_honda.h
@@ -143,7 +143,7 @@ const safety_hooks honda_hooks = {
   .rx = honda_rx_hook,
   .tx = honda_tx_hook,
   .tx_lin = honda_tx_lin_hook,
-  .ignition = honda_ign_hook
+  .ignition = honda_ign_hook,
   .fwd = honda_fwd_hook,
 };
 
@@ -165,5 +165,6 @@ const safety_hooks honda_bosch_hooks = {
   .rx = honda_rx_hook,
   .tx = honda_tx_hook,
   .tx_lin = honda_tx_lin_hook,
+  .ignition = honda_ign_hook,
   .fwd = honda_bosch_fwd_hook,
 };
diff --git a/board/safety/safety_toyota.h b/board/safety/safety_toyota.h
index ef3e79da64210e..2a9e3eabf38fec 100644
--- a/board/safety/safety_toyota.h
+++ b/board/safety/safety_toyota.h
@@ -220,7 +220,7 @@ const safety_hooks toyota_hooks = {
   .rx = toyota_rx_hook,
   .tx = toyota_tx_hook,
   .tx_lin = toyota_tx_lin_hook,
-  .ignition = toyota_ign_hook
+  .ignition = toyota_ign_hook,
   .fwd = toyota_fwd_hook,
 };
 
@@ -235,6 +235,6 @@ const safety_hooks toyota_nolimits_hooks = {
   .rx = toyota_rx_hook,
   .tx = toyota_tx_hook,
   .tx_lin = toyota_tx_lin_hook,
-  .ignition = toyota_ign_hook
+  .ignition = toyota_ign_hook,
   .fwd = toyota_fwd_hook,
 };