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/drivers/mmcsd/mmcsd_sdio.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/drivers/mmcsd/mmcsd_sdio.c')
| -rw-r--r-- | nuttx/drivers/mmcsd/mmcsd_sdio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nuttx/drivers/mmcsd/mmcsd_sdio.c b/nuttx/drivers/mmcsd/mmcsd_sdio.c index b17ae077d..3caa61583 100644 --- a/nuttx/drivers/mmcsd/mmcsd_sdio.c +++ b/nuttx/drivers/mmcsd/mmcsd_sdio.c @@ -38,6 +38,9 @@ ****************************************************************************/ #include <nuttx/config.h> + +#if defined (CONFIG_MMCSD) && defined (CONFIG_MMCSD_SDIO) + #include <nuttx/compiler.h> #include <sys/types.h> @@ -3179,3 +3182,5 @@ errout_with_alloc: kfree(priv); return ret; } + +#endif /* defined (CONFIG_MMCSD) && defined (CONFIG_MMCSD_SDIO) */ |