diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /arch/um/drivers/daemon.h | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
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); |