diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
| commit | 2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc (patch) | |
| tree | fe533abe3e7c400848647b95e4806f5125c654c3 /arch/um/drivers/slirp_user.c | |
| parent | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/drivers/slirp_user.c')
| -rw-r--r-- | arch/um/drivers/slirp_user.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c index 8d91f663d82c..b94c66114bc8 100644 --- a/arch/um/drivers/slirp_user.c +++ b/arch/um/drivers/slirp_user.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include "net_user.h" | 13 | #include "net_user.h" |
| 14 | #include "slirp.h" | 14 | #include "slirp.h" |
| 15 | #include "slip_common.h" | 15 | #include "slip_common.h" |
| 16 | #include "helper.h" | ||
| 17 | #include "os.h" | 16 | #include "os.h" |
| 18 | 17 | ||
| 19 | void slirp_user_init(void *data, void *dev) | 18 | void slirp_user_init(void *data, void *dev) |