From c02fab20fdf21a2c22eabb8effd7348b278c7ab9 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Mon, 9 Jul 2018 14:54:05 -0700 Subject: [PATCH] kinetis:tone_alarm fixed rebase error. --- src/drivers/kinetis/tone_alarm/tone_alarm.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/drivers/kinetis/tone_alarm/tone_alarm.cpp b/src/drivers/kinetis/tone_alarm/tone_alarm.cpp index 533ad7db3e..d01b77fe75 100644 --- a/src/drivers/kinetis/tone_alarm/tone_alarm.cpp +++ b/src/drivers/kinetis/tone_alarm/tone_alarm.cpp @@ -206,7 +206,7 @@ class ToneAlarm : public device::CDev { public: ToneAlarm(); - ~ToneAlarm() = default; + ~ToneAlarm(); virtual int init(); void status(); @@ -287,6 +287,7 @@ ToneAlarm::~ToneAlarm() usleep(100000); } } + int ToneAlarm::init() {