diff options
| author | px4dev <px4@purgatory.org> | 2013-01-11 02:14:43 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-11 02:14:43 -0800 |
| commit | f127495caa2d45a1b1fff3be7a9d3756259d23e2 (patch) | |
| tree | 91daf599eae326f2207d0fbd9ede34b51eca1812 /nuttx/sched/sched_getscheduler.c | |
| parent | 48c5d63319be3b8da7c4cd598d2a31dceae842a7 (diff) | |
| download | px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.gz px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.bz2 px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.zip | |
Manually fixup merge botches via direct comparison with NuttX r5447.
Diffstat (limited to 'nuttx/sched/sched_getscheduler.c')
| -rw-r--r-- | nuttx/sched/sched_getscheduler.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nuttx/sched/sched_getscheduler.c b/nuttx/sched/sched_getscheduler.c index 5771e86ff..0d996ca27 100644 --- a/nuttx/sched/sched_getscheduler.c +++ b/nuttx/sched/sched_getscheduler.c @@ -129,3 +129,4 @@ int sched_getscheduler(pid_t pid) return SCHED_FIFO; } } + |