diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-07-04 23:48:32 +0200 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-07-04 23:48:32 +0200 |
| commit | 06c3d5420080bc1c6fdfb213a9d616b75611c159 (patch) | |
| tree | e882a83c3a76c82e3a8e832eb3805c0c5c010d0d /src/kernel/ao_flight.c | |
| parent | eb5bd00b1c5045e64753ba9d066ef5cfce9d5a1e (diff) | |
| parent | ea1ff225f1f450ee3fc377807d1bb7b982bf792d (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'src/kernel/ao_flight.c')
| -rw-r--r-- | src/kernel/ao_flight.c | 2 |
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 */ |