diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:16:47 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-28 00:16:47 +0200 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /arch/um/include/net_kern.h | |
| parent | [PATCH] Fix reference of uninitialised memory in ata_device_add() (diff) | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-3b9f6cb8a1ec791be79c6c7595fea922f12d1e64.tar.xz linux-3b9f6cb8a1ec791be79c6c7595fea922f12d1e64.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/um/include/net_kern.h')
| -rw-r--r-- | arch/um/include/net_kern.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h index f7de6df60dd7..769fba43ee03 100644 --- a/arch/um/include/net_kern.h +++ b/arch/um/include/net_kern.h @@ -54,8 +54,8 @@ struct transport { struct list_head list; char *name; int (*setup)(char *, char **, void *); - struct net_user_info *user; - struct net_kern_info *kern; + const struct net_user_info *user; + const struct net_kern_info *kern; int private_size; int setup_size; }; |