diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /arch/um/drivers/slirp.h | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/um/drivers/slirp.h')
| -rw-r--r-- | arch/um/drivers/slirp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/slirp.h b/arch/um/drivers/slirp.h index 6cf88ab580c9..89ccf83b7577 100644 --- a/arch/um/drivers/slirp.h +++ b/arch/um/drivers/slirp.h | |||
| @@ -24,7 +24,7 @@ struct slirp_data { | |||
| 24 | struct slip_proto slip; | 24 | struct slip_proto slip; |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | extern struct net_user_info slirp_user_info; | 27 | extern const struct net_user_info slirp_user_info; |
| 28 | 28 | ||
| 29 | extern int slirp_user_read(int fd, void *buf, int len, struct slirp_data *pri); | 29 | extern int slirp_user_read(int fd, void *buf, int len, struct slirp_data *pri); |
| 30 | extern int slirp_user_write(int fd, void *buf, int len, | 30 | extern int slirp_user_write(int fd, void *buf, int len, |