diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-21 14:41:03 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-21 14:41:03 +0100 |
| commit | dcdde8ea88bf57b0432d2b64ed3ce606795c8d00 (patch) | |
| tree | 0bf6e997ffe7f7a9cda98c832dbce39601a9242f /src/drivers/drv_mag.h | |
| parent | 3a38b0fe359296aa19ec43ab82743aebeadb335c (diff) | |
| parent | e8e4a3b5da058bd2ab8575c095dd74a5484333be (diff) | |
| download | px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.tar.gz px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.tar.bz2 px4-firmware-dcdde8ea88bf57b0432d2b64ed3ce606795c8d00.zip | |
Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge
Conflicts:
src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp
src/modules/uORB/topics/vehicle_attitude.h
Diffstat (limited to 'src/drivers/drv_mag.h')
| -rw-r--r-- | src/drivers/drv_mag.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/drivers/drv_mag.h b/src/drivers/drv_mag.h index 5ddf5d08e..d341e8947 100644 --- a/src/drivers/drv_mag.h +++ b/src/drivers/drv_mag.h @@ -41,9 +41,11 @@ #include <stdint.h> #include <sys/ioctl.h> +#include "drv_device.h" #include "drv_sensor.h" #include "drv_orb_dev.h" + #define MAG_DEVICE_PATH "/dev/mag" /** |