summaryrefslogtreecommitdiff
path: root/src/kernel/ao_flight.c
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2016-07-04 23:47:24 +0200
committerBdale Garbee <bdale@gag.com>2016-07-04 23:47:24 +0200
commit2e26d1ab42163988dc26b06b016c3b05efe17659 (patch)
tree5736db47fa979abb0e37b0fc3b956cd6cdbe9405 /src/kernel/ao_flight.c
parent639e461ded29a48c155afea12171cbfc191ccfd7 (diff)
parent65ed2f588ca596fe9aa559bebd590a2a11b9859b (diff)
Merge branch 'master' into branch-1.6
Diffstat (limited to 'src/kernel/ao_flight.c')
-rw-r--r--src/kernel/ao_flight.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel/ao_flight.c b/src/kernel/ao_flight.c
index 9ba02bb8..9031a54a 100644
--- a/src/kernel/ao_flight.c
+++ b/src/kernel/ao_flight.c
@@ -130,7 +130,7 @@ ao_flight(void)
{
/* Set pad mode - we can fly! */
ao_flight_state = ao_flight_pad;
-#if HAS_USB && !HAS_FLIGHT_DEBUG && !HAS_SAMPLE_PROFILE
+#if HAS_USB && !HAS_FLIGHT_DEBUG && !HAS_SAMPLE_PROFILE && !DEBUG
/* Disable the USB controller in flight mode
* to save power
*/