diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
| commit | 36318d1929e9437df0402a78ff63a70f78d6a89e (patch) | |
| tree | 38588eaa8b400d7abf384a17e21dea75b104b177 /libmachdev/machdev.h | |
| parent | eaa21da4ea94937a1bc2157c042a233d524d17ce (diff) | |
| parent | d261675a592f6109826ccbdb07c7f485c4c88683 (diff) | |
Merge branch 'dde-upstream' into dde
Conflicts:
dde_e100/Makefile
dde_e1000/Makefile
dde_ne2k_pci/Makefile
dde_pcnet32/Makefile
dde_rtl8139/Makefile
Diffstat (limited to 'libmachdev/machdev.h')
| -rw-r--r-- | libmachdev/machdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmachdev/machdev.h b/libmachdev/machdev.h index cfa4b2d4..b9186fba 100644 --- a/libmachdev/machdev.h +++ b/libmachdev/machdev.h @@ -23,7 +23,7 @@ #ifndef __MACHDEV_H__ #define __MACHDEV_H__ -void ds_server(void); +void * ds_server(void *); void mach_device_init(void); void register_net(void); void register_block(void); |