diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-01-23 17:40:10 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-01-23 17:40:10 +0000 |
| commit | 5541ec017e6dbdf6ca9c81ab58401579f94b01ec (patch) | |
| tree | 559dbf5ee5030a970fbffb50af3a125a6b21071f /nuttx/arch/sim/src/up_initialize.c | |
| parent | 34ac2896338a1c4f3e953cdf13c2583c4ccf218c (diff) | |
| download | px4-nuttx-5541ec017e6dbdf6ca9c81ab58401579f94b01ec.tar.gz px4-nuttx-5541ec017e6dbdf6ca9c81ab58401579f94b01ec.tar.bz2 px4-nuttx-5541ec017e6dbdf6ca9c81ab58401579f94b01ec.zip | |
Incorporate uIP patches
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3274 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sim/src/up_initialize.c')
| -rw-r--r-- | nuttx/arch/sim/src/up_initialize.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/sim/src/up_initialize.c b/nuttx/arch/sim/src/up_initialize.c index eeea2abed..257be8ab5 100644 --- a/nuttx/arch/sim/src/up_initialize.c +++ b/nuttx/arch/sim/src/up_initialize.c @@ -1,7 +1,7 @@ /**************************************************************************** * up_initialize.c * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -101,7 +101,7 @@ void up_initialize(void) #if defined(CONFIG_FS_FAT) && !defined(CONFIG_DISABLE_MOUNTPOINT) up_registerblockdevice(); /* Our FAT ramdisk at /dev/ram0 */ #endif -#if defined(CONFIG_NET) && defined(linux) +#ifdef CONFIG_NET uipdriver_init(); /* Our "real" netwok driver */ #endif } |