Changeset a7d1992c in rtems for cpukit/libfs/src/imfs/imfs.h


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/libfs/src/imfs/imfs.h

    rd5d071d ra7d1992c  
    436436);
    437437
    438 extern int memfile_ioctl(
    439   rtems_libio_t *iop,             /* IN  */
    440   uint32_t       command,         /* IN  */
    441   void          *buffer           /* IN  */
    442 );
    443 
    444438extern int device_open(
    445439  rtems_libio_t *iop,            /* IN  */
     
    466460
    467461extern int device_ioctl(
    468   rtems_libio_t *iop,               /* IN  */
    469   uint32_t       command,           /* IN  */
    470   void          *buffer             /* IN  */
     462  rtems_libio_t   *iop,
     463  ioctl_command_t  command,
     464  void            *buffer
    471465);
    472466
Note: See TracChangeset for help on using the changeset viewer.