aboutsummaryrefslogtreecommitdiff
path: root/nuttx/graphics/nxmu/nxmu_kbdin.c
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-01-11 02:14:43 -0800
committerpx4dev <px4@purgatory.org>2013-01-11 02:14:43 -0800
commitf127495caa2d45a1b1fff3be7a9d3756259d23e2 (patch)
tree91daf599eae326f2207d0fbd9ede34b51eca1812 /nuttx/graphics/nxmu/nxmu_kbdin.c
parent48c5d63319be3b8da7c4cd598d2a31dceae842a7 (diff)
downloadpx4-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/graphics/nxmu/nxmu_kbdin.c')
-rw-r--r--nuttx/graphics/nxmu/nxmu_kbdin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx/graphics/nxmu/nxmu_kbdin.c b/nuttx/graphics/nxmu/nxmu_kbdin.c
index 2c658009b..0308c2bfa 100644
--- a/nuttx/graphics/nxmu/nxmu_kbdin.c
+++ b/nuttx/graphics/nxmu/nxmu_kbdin.c
@@ -108,7 +108,7 @@ void nxmu_kbdin(FAR struct nxfe_state_s *fe, uint8_t nch, FAR uint8_t *ch)
outmsg->ch[i] = ch[i];
}
- (void)nxmu_sendclient(fe->be.topwnd->conn, outmsg, size);
+ (void)nxmu_sendclientwindow(fe->be.topwnd, outmsg, size);
free(outmsg);
}
}