From 3a651873030243574f51235b83e05cb72774e9c6 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Wed, 6 May 2015 16:00:00 -0700 Subject: [PATCH] Fixed bad merge Forgot to remove old file line when merging the changes from master. Signed-off-by: Mark Charlebois --- src/modules/commander/accelerometer_calibration.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/commander/accelerometer_calibration.cpp b/src/modules/commander/accelerometer_calibration.cpp index 1b80d5c09d..5d7852816b 100644 --- a/src/modules/commander/accelerometer_calibration.cpp +++ b/src/modules/commander/accelerometer_calibration.cpp @@ -435,7 +435,6 @@ calibrate_return read_accelerometer_avg(int (&subs)[max_accel_sens], float (&acc board_rotation = board_rotation_offset * board_rotation; px4_pollfd_struct_t fds[max_accel_sens]; - struct pollfd fds[max_accel_sens]; for (unsigned i = 0; i < max_accel_sens; i++) { fds[i].fd = subs[i];