Ignore:
Timestamp:
May 15, 2012, 8:06:18 AM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
1c0263c
Parents:
d5d071d (diff), da154e14 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libcsupport/src/__usrenv.c

    rd5d071d ra7d1992c  
    5252
    5353static void null_op_lock_or_unlock(
    54   rtems_filesystem_mount_table_entry_t *mt_entry
     54  const rtems_filesystem_mount_table_entry_t *mt_entry
    5555)
    5656{
     
    221221    }
    222222  },
     223  .ops = &null_ops,
    223224  .mt_point_node = &rtems_filesystem_global_location_null,
    224225  .mt_fs_root = &rtems_filesystem_global_location_null,
     
    234235    },
    235236    .handlers = &rtems_filesystem_null_handlers,
    236     .ops = &null_ops,
    237237    .mt_entry = &rtems_filesystem_null_mt_entry
    238238  },
Note: See TracChangeset for help on using the changeset viewer.