diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /arch/um/drivers/daemon.h | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/um/drivers/daemon.h')
| -rw-r--r-- | arch/um/drivers/daemon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/daemon.h b/arch/um/drivers/daemon.h index 7326c42f7ef9..3bc3cf6b94aa 100644 --- a/arch/um/drivers/daemon.h +++ b/arch/um/drivers/daemon.h | |||
| @@ -18,7 +18,7 @@ struct daemon_data { | |||
| 18 | void *dev; | 18 | void *dev; |
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | extern struct net_user_info daemon_user_info; | 21 | extern const struct net_user_info daemon_user_info; |
| 22 | 22 | ||
| 23 | extern int daemon_user_write(int fd, void *buf, int len, | 23 | extern int daemon_user_write(int fd, void *buf, int len, |
| 24 | struct daemon_data *pri); | 24 | struct daemon_data *pri); |